[ros-diffs] [cgutman] 45460: - Build fixes - For some reason when I applied the patch from my other WC to this one, I ended up with 2-3 copies of the same code in each file

Author: cgutman
Date: Sat Feb  6 15:24:55 2010
New Revision: 45460

URL: http://svn.reactos.org/svn/reactos?rev=45460&view=rev
Log:
 - Build fixes
 - For some reason when I applied the patch from my other WC to this one, I ended up with
2-3 copies of the same code in each file

Removed:
    branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslibp.h
Modified:
    branches/aicom-network-branch/dll/win32/dnsapi/dnsapi/memory.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/addr.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/debug.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/dnsaddr.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/dnsutil.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/flatbuf.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/hostent.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslib.h
    branches/aicom-network-branch/dll/win32/mswsock/dns/inc/windnsp.h
    branches/aicom-network-branch/dll/win32/mswsock/dns/ip6.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/memory.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/name.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/print.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/record.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/rrprint.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/sablob.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/straddr.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/string.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/table.c
    branches/aicom-network-branch/dll/win32/mswsock/dns/utf8.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/addrconv.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/afdsan.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/async.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/bind.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/getname.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/helper.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/nspeprot.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/recv.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanaccpt.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanconn.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanflow.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanlistn.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanprov.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrdma.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrecv.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sansend.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanshutd.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sansock.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/santf.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sanutil.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/shutdown.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sockerr.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/spi.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/tpackets.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/tranfile.c
    branches/aicom-network-branch/dll/win32/mswsock/msafd/wspmisc.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock.rbuild
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/init.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/msext.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspgaddr.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspmisc.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspsvc.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsptcpip.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsputil.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/proc.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/recvex.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/setup.c
    branches/aicom-network-branch/dll/win32/mswsock/mswsock/stubs.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/context.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/getserv.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/init.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/logit.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/lookup.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/nbt.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/nsp.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/oldutil.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/proc.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/r_comp.c
    branches/aicom-network-branch/dll/win32/mswsock/rnr20/util.c
    branches/aicom-network-branch/dll/win32/mswsock/wsmobile/lpc.c
    branches/aicom-network-branch/dll/win32/mswsock/wsmobile/nsp.c
    branches/aicom-network-branch/dll/win32/mswsock/wsmobile/service.c
    branches/aicom-network-branch/dll/win32/mswsock/wsmobile/update.c
    branches/aicom-network-branch/include/reactos/winsock/msafd.h
    branches/aicom-network-branch/include/reactos/winsock/msafdlib.h
    branches/aicom-network-branch/include/reactos/winsock/mswinsock.h
    branches/aicom-network-branch/include/reactos/winsock/rnr20lib.h
    branches/aicom-network-branch/include/reactos/winsock/wsmobile.h

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/aicom-network-branch/dll/win32/dnsapi/dnsapi/memory.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/addr.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/debug.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/dnsaddr.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/dnsutil.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/flatbuf.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/hostent.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslib.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Removed: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslibp.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/windnsp.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/ip6.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/memory.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/name.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/print.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/record.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/rrprint.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/sablob.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/straddr.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/string.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/table.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/utf8.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/addrconv.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/afdsan.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/async.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/bind.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/getname.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/helper.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/nspeprot.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/recv.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanaccpt.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanconn.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanflow.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanlistn.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanprov.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrdma.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrecv.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sansend.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanshutd.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sansock.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/santf.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanutil.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockerr.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/spi.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/tpackets.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/tranfile.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/wspmisc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/msext.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspgaddr.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspmisc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspsvc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsptcpip.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsputil.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/proc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/recvex.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/setup.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/stubs.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/context.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/getserv.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/logit.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/lookup.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/nbt.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/nsp.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/oldutil.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/proc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/r_comp.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/util.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/lpc.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/nsp.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/service.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/update.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/…

Modified: branches/aicom-network-branch/include/reactos/winsock/msafd.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…

Modified: branches/aicom-network-branch/include/reactos/winsock/msafdlib.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…

Modified: branches/aicom-network-branch/include/reactos/winsock/mswinsock.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…

Modified: branches/aicom-network-branch/include/reactos/winsock/rnr20lib.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…

Modified: branches/aicom-network-branch/include/reactos/winsock/wsmobile.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…