* include/winsock.h (_SYS_TYPES_H macro guard for int types): Remove; use only
_BSDTYPES_DEFINED macro now defined in newlib sys/types.h. (SYS_TYPES_H macro guard for fd_set): Replace with_SYS_TYPES_FD_SET macro now defined in newlib sys/types.h. Emit warning if defined. * include/winsock2.h: Ditto. * include/windows.h (Win32_Winsock): Replace with new macros __USE_W32_SOCKETS and warn of deprecation.
This commit is contained in:
@ -133,7 +133,14 @@
|
||||
#include <shellapi.h>
|
||||
#include <winperf.h>
|
||||
#include <winspool.h>
|
||||
#if defined(Win32_Winsock) || !(defined(__INSIDE_CYGWIN__) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_UWIN))
|
||||
#if defined(Win32_Winsock)
|
||||
#warning "The Win32_Winsock macro name is deprecated.\
|
||||
Please use __USE_W32_SOCKETS instead"
|
||||
#ifndef __USE_W32_SOCKETS
|
||||
#define __USE_W32_SOCKETS
|
||||
#endif
|
||||
#endif
|
||||
#if defined(__USE_W32_SOCKETS) || !(defined(__INSIDE_CYGWIN__) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_UWIN))
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
#endif /* WIN32_LEAN_AND_MEAN */
|
||||
|
Reference in New Issue
Block a user