- New winsock (part 4 of x)

 - Rename ws2_32_new to ws2_32

svn path=/branches/aicom-network-branch/; revision=45451

diff --git a/dll/win32/ws2_32_new/inc/ws2_32.h b/dll/win32/ws2_32/inc/ws2_32.h
similarity index 100%
rename from dll/win32/ws2_32_new/inc/ws2_32.h
rename to dll/win32/ws2_32/inc/ws2_32.h

diff --git a/dll/win32/ws2_32_new/inc/ws2_32p.h b/dll/win32/ws2_32/inc/ws2_32p.h
similarity index 100%
rename from dll/win32/ws2_32_new/inc/ws2_32p.h
rename to dll/win32/ws2_32/inc/ws2_32p.h

diff --git a/dll/win32/ws2_32_new/src/addrconv.c b/dll/win32/ws2_32/src/addrconv.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/addrconv.c
rename to dll/win32/ws2_32/src/addrconv.c

diff --git a/dll/win32/ws2_32_new/src/addrinfo.c b/dll/win32/ws2_32/src/addrinfo.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/addrinfo.c
rename to dll/win32/ws2_32/src/addrinfo.c

diff --git a/dll/win32/ws2_32_new/src/async.c b/dll/win32/ws2_32/src/async.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/async.c
rename to dll/win32/ws2_32/src/async.c

diff --git a/dll/win32/ws2_32_new/src/bhook.c b/dll/win32/ws2_32/src/bhook.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/bhook.c
rename to dll/win32/ws2_32/src/bhook.c

diff --git a/dll/win32/ws2_32_new/src/dcatalog.c b/dll/win32/ws2_32/src/dcatalog.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dcatalog.c
rename to dll/win32/ws2_32/src/dcatalog.c

diff --git a/dll/win32/ws2_32_new/src/dcatitem.c b/dll/win32/ws2_32/src/dcatitem.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dcatitem.c
rename to dll/win32/ws2_32/src/dcatitem.c

diff --git a/dll/win32/ws2_32_new/src/dllmain.c b/dll/win32/ws2_32/src/dllmain.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dllmain.c
rename to dll/win32/ws2_32/src/dllmain.c

diff --git a/dll/win32/ws2_32_new/src/dprocess.c b/dll/win32/ws2_32/src/dprocess.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dprocess.c
rename to dll/win32/ws2_32/src/dprocess.c

diff --git a/dll/win32/ws2_32_new/src/dprovide.c b/dll/win32/ws2_32/src/dprovide.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dprovide.c
rename to dll/win32/ws2_32/src/dprovide.c

diff --git a/dll/win32/ws2_32_new/src/dsocket.c b/dll/win32/ws2_32/src/dsocket.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dsocket.c
rename to dll/win32/ws2_32/src/dsocket.c

diff --git a/dll/win32/ws2_32_new/src/dthread.c b/dll/win32/ws2_32/src/dthread.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dthread.c
rename to dll/win32/ws2_32/src/dthread.c

diff --git a/dll/win32/ws2_32_new/src/dupsock.c b/dll/win32/ws2_32/src/dupsock.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/dupsock.c
rename to dll/win32/ws2_32/src/dupsock.c

diff --git a/dll/win32/ws2_32_new/src/enumprot.c b/dll/win32/ws2_32/src/enumprot.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/enumprot.c
rename to dll/win32/ws2_32/src/enumprot.c

diff --git a/dll/win32/ws2_32_new/src/event.c b/dll/win32/ws2_32/src/event.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/event.c
rename to dll/win32/ws2_32/src/event.c

diff --git a/dll/win32/ws2_32_new/src/getproto.c b/dll/win32/ws2_32/src/getproto.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/getproto.c
rename to dll/win32/ws2_32/src/getproto.c

diff --git a/dll/win32/ws2_32_new/src/getxbyxx.c b/dll/win32/ws2_32/src/getxbyxx.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/getxbyxx.c
rename to dll/win32/ws2_32/src/getxbyxx.c

diff --git a/dll/win32/ws2_32_new/src/ioctl.c b/dll/win32/ws2_32/src/ioctl.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/ioctl.c
rename to dll/win32/ws2_32/src/ioctl.c

diff --git a/dll/win32/ws2_32_new/src/nscatalo.c b/dll/win32/ws2_32/src/nscatalo.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/nscatalo.c
rename to dll/win32/ws2_32/src/nscatalo.c

diff --git a/dll/win32/ws2_32_new/src/nscatent.c b/dll/win32/ws2_32/src/nscatent.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/nscatent.c
rename to dll/win32/ws2_32/src/nscatent.c

diff --git a/dll/win32/ws2_32_new/src/nspinstl.c b/dll/win32/ws2_32/src/nspinstl.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/nspinstl.c
rename to dll/win32/ws2_32/src/nspinstl.c

diff --git a/dll/win32/ws2_32_new/src/nsprovid.c b/dll/win32/ws2_32/src/nsprovid.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/nsprovid.c
rename to dll/win32/ws2_32/src/nsprovid.c

diff --git a/dll/win32/ws2_32_new/src/nsquery.c b/dll/win32/ws2_32/src/nsquery.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/nsquery.c
rename to dll/win32/ws2_32/src/nsquery.c

diff --git a/dll/win32/ws2_32_new/src/qos.c b/dll/win32/ws2_32/src/qos.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/qos.c
rename to dll/win32/ws2_32/src/qos.c

diff --git a/dll/win32/ws2_32_new/src/qshelpr.c b/dll/win32/ws2_32/src/qshelpr.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/qshelpr.c
rename to dll/win32/ws2_32/src/qshelpr.c

diff --git a/dll/win32/ws2_32_new/src/rasdial.c b/dll/win32/ws2_32/src/rasdial.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/rasdial.c
rename to dll/win32/ws2_32/src/rasdial.c

diff --git a/dll/win32/ws2_32_new/src/recv.c b/dll/win32/ws2_32/src/recv.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/recv.c
rename to dll/win32/ws2_32/src/recv.c

diff --git a/dll/win32/ws2_32_new/src/rnr.c b/dll/win32/ws2_32/src/rnr.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/rnr.c
rename to dll/win32/ws2_32/src/rnr.c

diff --git a/dll/win32/ws2_32_new/src/scihlpr.c b/dll/win32/ws2_32/src/scihlpr.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/scihlpr.c
rename to dll/win32/ws2_32/src/scihlpr.c

diff --git a/dll/win32/ws2_32_new/src/select.c b/dll/win32/ws2_32/src/select.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/select.c
rename to dll/win32/ws2_32/src/select.c

diff --git a/dll/win32/ws2_32_new/src/send.c b/dll/win32/ws2_32/src/send.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/send.c
rename to dll/win32/ws2_32/src/send.c

diff --git a/dll/win32/ws2_32_new/src/sockctrl.c b/dll/win32/ws2_32/src/sockctrl.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/sockctrl.c
rename to dll/win32/ws2_32/src/sockctrl.c

diff --git a/dll/win32/ws2_32_new/src/socklife.c b/dll/win32/ws2_32/src/socklife.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/socklife.c
rename to dll/win32/ws2_32/src/socklife.c

diff --git a/dll/win32/ws2_32_new/src/spinstal.c b/dll/win32/ws2_32/src/spinstal.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/spinstal.c
rename to dll/win32/ws2_32/src/spinstal.c

diff --git a/dll/win32/ws2_32_new/src/sputil.c b/dll/win32/ws2_32/src/sputil.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/sputil.c
rename to dll/win32/ws2_32/src/sputil.c

diff --git a/dll/win32/ws2_32_new/src/startup.c b/dll/win32/ws2_32/src/startup.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/startup.c
rename to dll/win32/ws2_32/src/startup.c

diff --git a/dll/win32/ws2_32_new/src/wsautil.c b/dll/win32/ws2_32/src/wsautil.c
similarity index 100%
rename from dll/win32/ws2_32_new/src/wsautil.c
rename to dll/win32/ws2_32/src/wsautil.c

diff --git a/dll/win32/ws2_32_new/ws2_32.rbuild b/dll/win32/ws2_32/ws2_32.rbuild
similarity index 88%
rename from dll/win32/ws2_32_new/ws2_32.rbuild
rename to dll/win32/ws2_32/ws2_32.rbuild
index 88bce90..0f61e41 100644 (file)
--- a/dll/win32/ws2_32_new/ws2_32.rbuild
+++ b/dll/win32/ws2_32/ws2_32.rbuild
@@ -1,6 +1,6 @@
-<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll">
+<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll">
        <importlibrary definition="ws2_32.spec" />
-       <include base="ws2_32_new">inc</include>
+       <include base="ws2_32">inc</include>
        <include base="ReactOS">include/reactos/winsock</include>
        <define name="LE" />
        <library>wine</library>

diff --git a/dll/win32/ws2_32_new/ws2_32.rc b/dll/win32/ws2_32/ws2_32.rc
similarity index 100%
rename from dll/win32/ws2_32_new/ws2_32.rc
rename to dll/win32/ws2_32/ws2_32.rc

diff --git a/dll/win32/ws2_32_new/ws2_32.spec b/dll/win32/ws2_32/ws2_32.spec
similarity index 100%
rename from dll/win32/ws2_32_new/ws2_32.spec
rename to dll/win32/ws2_32/ws2_32.spec