diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2000-11-01 03:37:23 +0300 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2000-11-01 03:37:23 +0300 |
| commit | baf428f0d58567f532f9085f417f7d799a3d038d (patch) | |
| tree | f53e26c6538f422894f3b5c8caf5973177d5e140 /winsup/w32api/include/winsock.h | |
| parent | b12796a06d220e56474d2b28158fda9a193d9f37 (diff) | |
* include/basetyps.h: add comment for GUID_DEFINED
* include/lm.h: add includes for lmerr.h and lmserver.h
* include/lmcons.h: add W2K typedefs LMSTR, LMCSTR
* include/lmerr.h: add error codes
* include/lmserver.h: replace LPTSTR with LPWSTR,
LPTCSTR with LPWCSTR in structures and prototypes
* include/lmshare.h: ditto
* include/lmuse.h: ditto
* include/lmstats.h: ditto
* include/oleauto.h: add function prototype SystemTimeToVariantTime
* include/winbase.h: change first argument of CommConfigDialog to const
* include/windowsx.h: add macros defining FAR versions of
mem and string functions for porting from Win16 code
* include/winioctl.h: added IOCTL_STORAGE defines
* include/winnetwk.h: added WNNC_NET flags
* include/winnt.h: add include of <basetsd.h>;
add structs; add pointer typedefs for TOKEN structs
* include/winsock.h: add guard around BSD-ish typedefs
* include/wtypes.h: new VARENUM enums, new WIN32/WIN64 compat. macros
* include/basetsd.h: new file
* include/raserror.h: ditto
* include/rassapi.h: ditto
* include/ras.h: ditto
comment from Earnie: replaced original ras.h contribution with Danny's
contribution as it is more complete.
* include/rpcndr.h: add default definition for __RPCNDR_H_VERSION__
Diffstat (limited to 'winsup/w32api/include/winsock.h')
| -rw-r--r-- | winsup/w32api/include/winsock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index 885354aa2..85917e388 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -17,12 +17,14 @@ extern "C" { #endif -#ifndef _SYS_TYPES_H +#if !defined ( _BSDTYPES_DEFINED ) && !defined ( _SYS_TYPES_H ) +/* also defined in gmon.h and in cygwin's sys/types */ typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; typedef unsigned long u_long; -#endif /* ndef _SYS_TYPES_H */ +#define _BSDTYPES_DEFINED +#endif /* ndef _BSDTYPES_ _SYS_TYPES_H */ typedef u_int SOCKET; #ifndef FD_SETSIZE #define FD_SETSIZE 64 |