ChangeSet ID: 1005773185945359953213483 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@wine2. 01/11/14 16:26:25
Modified files: dlls/winsock : Makefile.in async.c socket.c winsock.spec ws2_32.spec dlls/wsock32 : protocol.c socket.c wsock32.spec include : Makefile.in windows.h winsock.h winsock2.h wsipx.h include/wine : winsock16.h Added files: include : ws2tcpip.h
Log message: Francois Gouget fgouget@free.fr Make winsock.h and winsock2.h independent from the Unix headers. Make them compatible with both the Unix C headers and the MSVCRT headers. Ensure compatibility with the Unix headers via the USE_WS_PREFIX macro. Add WINE_NOWINSOCK: prevents winsock.h from being included from windows.h when defined. Add ws2tcpip.h, move definitions to the right header.
Patch: http://cvs.winehq.com/patch.py?id=1005773185945359953213483
Revision Changes Path 1.11 +1 -0 wine/dlls/winsock/Makefile.in 1.20 +9 -9 wine/dlls/winsock/async.c 1.68 +140 -119 wine/dlls/winsock/socket.c 1.4 +5 -5 wine/dlls/winsock/winsock.spec 1.14 +31 -31 wine/dlls/winsock/ws2_32.spec 1.7 +19 -5 wine/dlls/wsock32/protocol.c 1.16 +35 -24 wine/dlls/wsock32/socket.c 1.7 +1 -1 wine/dlls/wsock32/wsock32.spec 1.35 +1 -0 wine/include/Makefile.in 1.52 +2 -0 wine/include/windows.h 1.37 +752 -320 wine/include/winsock.h 1.11 +359 -163 wine/include/winsock2.h 1.3 +11 -13 wine/include/wsipx.h 1.1 +0 -0 wine/include/ws2tcpip.h 1.4 +1 -1 wine/include/wine/winsock16.h