Module: wine Branch: master Commit: ca788bbc26676466ec7aa01a906efc0a17210408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca788bbc26676466ec7aa01a...
Author: Detlef Riekenberg wine.dev@web.de Date: Wed Sep 20 22:26:44 2006 +0200
include: Open Watcom compatibility (Fix _BSDTYPES_DEFINED typo).
---
include/msvcrt/sys/types.h | 4 ++-- include/winsock.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index fc6f269..abb05a3 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -52,12 +52,12 @@ typedef long time_t; #define _TIME_T_DEFINED #endif
-#ifndef _BSD_TYPES_DEFINED +#ifndef _BSDTYPES_DEFINED typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; typedef unsigned long u_long; -#define _BSD_TYPES_DEFINED +#define _BSDTYPES_DEFINED #endif
#define dev_t _dev_t diff --git a/include/winsock.h b/include/winsock.h index b86bda7..14ce99a 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -110,12 +110,13 @@ #endif #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_
-#if (defined(_MSC_VER) || defined(__MINGW_H)) && !defined(_BSD_TYPES_DEFINED) +#if (defined(_MSC_VER) || defined(__MINGW_H) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED) /* MinGW doesn't define the u_xxx types */ typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; typedef unsigned long u_long; +#define _BSDTYPES_DEFINED #endif
#ifdef USE_WS_PREFIX