[ros-diffs] [sginsberg] 43134: Remove leftover ws2help.h that somehow didn't get deleted by the latest sync -- ws2help now builds again as the correct header gets included. Re-enable ws2help and ws2_32 again -- both build fine.

sginsberg at svn.reactos.org sginsberg at svn.reactos.org
Thu Sep 24 20:51:53 CEST 2009


Author: sginsberg
Date: Thu Sep 24 20:51:53 2009
New Revision: 43134

URL: http://svn.reactos.org/svn/reactos?rev=43134&view=rev
Log:
Remove leftover ws2help.h that somehow didn't get deleted by the latest sync -- ws2help now builds again as the correct header gets included. Re-enable ws2help and ws2_32 again -- both build fine.

Removed:
    branches/arwinss/reactos/dll/win32/ws2help/ws2help.h
Modified:
    branches/arwinss/reactos/dll/win32/win32.rbuild

Modified: branches/arwinss/reactos/dll/win32/win32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/win32.rbuild?rev=43134&r1=43133&r2=43134&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Sep 24 20:51:53 2009
@@ -628,12 +628,12 @@
 <directory name="ws2_32">
 	<xi:include href="ws2_32/ws2_32.rbuild" />
 </directory>
-<!--directory name="ws2_32_new">
+<directory name="ws2_32_new">
 	<xi:include href="ws2_32_new/ws2_32.rbuild" />
 </directory>
 <directory name="ws2help">
 	<xi:include href="ws2help/ws2help.rbuild" />
-</directory-->
+</directory>
 <directory name="wshirda">
 	<xi:include href="wshirda/wshirda.rbuild" />
 </directory>

Removed: branches/arwinss/reactos/dll/win32/ws2help/ws2help.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2help/ws2help.h?rev=43133&view=auto
==============================================================================
--- branches/arwinss/reactos/dll/win32/ws2help/ws2help.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/ws2help/ws2help.h (removed)
@@ -1,21 +1,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS WinSock 2 Helper DLL for TCP/IP
- * FILE:        include/ws2help.h
- * PURPOSE:     WinSock 2 Helper DLL for TCP/IP header
- */
-#ifndef __WS2HELP_H
-#define __WS2HELP_H
-
-#define WIN32_NO_STATUS
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-#include <wsahelp.h>
-
-#define EXPORT WINAPI
-
-#endif /* __WS2HELP_H */
-
-/* EOF */




More information about the Ros-diffs mailing list