Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/plugins/SocketPlugin
Modified Files:
Tag: ned-branch
sqWin32NewNet.c
Log Message:
Initial GCC 3.3 changes
Index: sqWin32NewNet.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** sqWin32NewNet.c 19 Jan 2004 22:25:51 -0000 1.9
--- sqWin32NewNet.c 16 Jul 2004 18:21:34 -0000 1.9.2.1
***************
*** 30,35 ****
#endif
- #if 0
-
#ifdef __MINGW32__
/*
--- 30,33 ----
***************
*** 66,85 ****
#define SIO_ADDRESS_LIST_SORT _WSAIORW(IOC_WS2,25)
-
- int
- FAR PASCAL
- WSAIoctl(
- SOCKET s,
- DWORD dwIoControlCode,
- LPVOID lpvInBuffer,
- DWORD cbInBuffer,
- LPVOID lpvOutBuffer,
- DWORD cbOutBuffer,
- LPDWORD lpcbBytesReturned,
- LPOVERLAPPED lpOverlapped,
- void *lpCompletionRoutine
- );
- #endif
-
#endif
--- 64,67 ----
***************
*** 1540,1558 ****
{ "SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE, 1 },
{ "SO_LINGER", SOL_SOCKET, SO_LINGER, 1 },
{ "IP_MULTICAST_IF", SOL_IP, IP_MULTICAST_IF, 1 },
{ "IP_MULTICAST_TTL", SOL_IP, IP_MULTICAST_TTL, 1 },
{ "IP_MULTICAST_LOOP", SOL_IP, IP_MULTICAST_LOOP, 1 },
{ "TCP_NODELAY", SOL_TCP, TCP_NODELAY, 1 },
{ "SO_RCVLOWAT", SOL_SOCKET, SO_RCVLOWAT, 1 },
{ "SO_SNDLOWAT", SOL_SOCKET, SO_SNDLOWAT, 1 },
/* multicast support */
{"IP_ADD_MEMBERSHIP", SOL_IP, IP_ADD_MEMBERSHIP, 100},
{"IP_DROP_MEMBERSHIP", SOL_IP, IP_DROP_MEMBERSHIP, 100},
- #if 0
/* WSAIoctl() support */
{"SIO_GET_BROADCAST_ADDRESS", 0, SIO_GET_BROADCAST_ADDRESS, 200},
- #endif
{ (char *)0, 0, 0, 0 }
};
--- 1522,1542 ----
{ "SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE, 1 },
{ "SO_LINGER", SOL_SOCKET, SO_LINGER, 1 },
+ #ifndef _WINSOCK2_H
{ "IP_MULTICAST_IF", SOL_IP, IP_MULTICAST_IF, 1 },
{ "IP_MULTICAST_TTL", SOL_IP, IP_MULTICAST_TTL, 1 },
{ "IP_MULTICAST_LOOP", SOL_IP, IP_MULTICAST_LOOP, 1 },
+ #endif
{ "TCP_NODELAY", SOL_TCP, TCP_NODELAY, 1 },
{ "SO_RCVLOWAT", SOL_SOCKET, SO_RCVLOWAT, 1 },
{ "SO_SNDLOWAT", SOL_SOCKET, SO_SNDLOWAT, 1 },
+ #ifndef _WINSOCK2_H
/* multicast support */
{"IP_ADD_MEMBERSHIP", SOL_IP, IP_ADD_MEMBERSHIP, 100},
{"IP_DROP_MEMBERSHIP", SOL_IP, IP_DROP_MEMBERSHIP, 100},
+ #endif
/* WSAIoctl() support */
{"SIO_GET_BROADCAST_ADDRESS", 0, SIO_GET_BROADCAST_ADDRESS, 200},
{ (char *)0, 0, 0, 0 }
};
|
