diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-03-20 22:27:37 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-03-20 22:27:37 +0300 |
| commit | dac9c6045fda7356cb50e0168f859dbbbf8d2c35 (patch) | |
| tree | 7c003d7cf54533a6573c1d89f1dc408ed3c20094 /winsup/w32api/include/windows.h | |
| parent | 8e65e2d3988c8267ccfe4e1fbb6b5078bb19f7a5 (diff) | |
* 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.
Diffstat (limited to 'winsup/w32api/include/windows.h')
| -rw-r--r-- | winsup/w32api/include/windows.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index 8fe9211c9..62598397d 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -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 */ |