Changeset 9521 for trunk/include/win/windef.h

Timestamp:

Dec 18, 2002, 1:24:32 PM (23 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/windef.h (modified) (4 diffs)

trunk/include/win/windef.h

@@ -8 +8 @@
 #define __WINE_WINDEF_H
 
-#ifdef __WINE__
+#if (defined(__WINE__)) && (!defined(__WIN32OS2__))
 # include "config.h"
 # undef UNICODE
@@ -284 +284 @@
 typedef float           FLOAT;
 #ifdef __WIN32OS2__
-#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__)
+#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
 typedef double          __int64;
+#elif defined (__EMX__)
+typedef long long       __int64;
 #endif
 #else
@@ -621 +623 @@
 #define MAX_PATH   260
 #define _MAX_DRIVE 3
-#if !defined(__WATCOMC__) || !defined(_MAX_DIR)
+#if !defined(__WATCOMC__) && !defined(_MAX_DIR)
 #define _MAX_DIR   256
 #endif
@@ -627 +629 @@
 #define _MAX_FNAME 255
 #endif
-#if !defined(__WATCOMC__) || !defined(_MAX_EXT)
+#if !defined(__WATCOMC__) && !defined(_MAX_EXT)
 #define _MAX_EXT   256
 #endif