diff options
| author | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2006-04-06 12:16:49 +0000 |
|---|---|---|
| committer | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2006-04-06 12:16:49 +0000 |
| commit | e98a5b1c437b5d1b96aa6fce27b21f5638696b3f (patch) | |
| tree | 78139cd0330dc0a92a24932b4cab2faa6ca3e662 | |
| parent | 944a4fa77025645377bab095021971a1fa6f6237 (diff) | |
| download | cygnal-e98a5b1c437b5d1b96aa6fce27b21f5638696b3f.tar.gz cygnal-e98a5b1c437b5d1b96aa6fce27b21f5638696b3f.tar.bz2 cygnal-e98a5b1c437b5d1b96aa6fce27b21f5638696b3f.zip | |
* include/iptypes.h (IP_ADAPTER_*): Define parts that depend
on SOCKET_ADDRESS only if winsock2.h has already been included.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/iptypes.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6633721d6..d46694c1e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2006-04-06 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/iptypes.h (IP_ADAPTER_*): Define parts that depend + on SOCKET_ADDRESS only if winsock2.h has already been included. + +2006-04-06 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/winuser.h (WM_IME_*): Remove. Defined in imm.h. 2006-04-05 Dimitri Papadopoulos <papadopo@users.sourceforge.net> diff --git a/winsup/w32api/include/iptypes.h b/winsup/w32api/include/iptypes.h index 4c67c4ac5..531dfd3bf 100644 --- a/winsup/w32api/include/iptypes.h +++ b/winsup/w32api/include/iptypes.h @@ -83,7 +83,7 @@ typedef struct _FIXED_INFO { UINT EnableProxy; UINT EnableDns; } FIXED_INFO, *PFIXED_INFO; -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0501) && defined(_WINSOCK2_H) typedef enum { IfOperStatusUp = 1, IfOperStatusDown, diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index d99d84cbc..b595b597c 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -15,6 +15,7 @@ #endif #define _GNU_H_WINDOWS32_SOCKETS + #include <windows.h> #ifdef __cplusplus |