Changeset 21421 for trunk/include

Timestamp:

Aug 17, 2010, 11:48:28 PM (15 years ago)

Author:

dmik

Message:

Make sure basetsd.h is eventually included by windows.h (for compatibility with current Windows SDK versions).

Location:

trunk/include/win

Files:

• basetsd.h (modified) (2 diffs)
• windef.h (modified) (4 diffs)

trunk/include/win/basetsd.h

@@ -56 +56 @@
 #  endif
 #  ifndef __int64
-#    define __int64 long long
+#    if defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+#      define __int64 double
+#    elif !defined(__WIN32OS2__) || defined(__EMX__)
+#      define __int64 long long
+#    endif
 #  endif
 #endif /* !defined(_MSC_VER) */
@@ -87 +91 @@
 typedef unsigned __int64 ULONG64, *PULONG64;
 typedef unsigned __int64 DWORD64, *PDWORD64;
+#elif defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+typedef __int64 INT64, *PINT64;
+typedef __int64 UINT64, *PUINT64;
+typedef __int64 LONG64, *PLONG64;
+typedef __int64 ULONG64, *PULONG64;
+typedef __int64 DWORD64, *PDWORD64;
 #else
 typedef signed __int64   DECLSPEC_ALIGN(8) INT64, *PINT64;

trunk/include/win/windef.h

@@ -18 +18 @@
 #include <wchar.h>
 #endif
+
+#include <basetsd.h>
 
 #ifdef __cplusplus
@@ -220 +222 @@
 typedef void            VOID;
 #endif
-typedef short           INT16;
-typedef unsigned short  UINT16;
 typedef int             INT;
-
-#ifndef INT_PTR_D
-#define INT_PTR_D
-typedef int             INT_PTR, *PINT_PTR;
-#endif
 typedef unsigned int    UINT;
-typedef signed int      INT32;
-#ifndef UINT_PTR_D
-#define UINT_PTR_D
-typedef unsigned int    UINT_PTR, *PUINT_PTR;
-#endif
 typedef unsigned short  WORD;
 typedef unsigned long   DWORD;
-#ifndef DWORD_PTR_D
-#define DWORD_PTR_D
-typedef unsigned long   DWORD_PTR, *PDWORD_PTR;
-#endif
 typedef unsigned long   ULONG;
 typedef unsigned char   BYTE;
@@ -260 +246 @@
 #endif
 typedef double          DATE;
-typedef long            LONG_PTR;
-typedef unsigned long   ULONG_PTR;
 typedef double          DOUBLE;
 #if (__IBMC__ < 360) && (__IBMCPP__ < 360) && !defined (__EMX__)
@@ -325 +309 @@
 typedef DWORD           LCTYPE;
 typedef float           FLOAT;
-#ifdef __WIN32OS2__
-#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
-typedef double          __int64;
-#elif defined (__EMX__)
-typedef long long       __int64;
-#endif
-#else
-typedef long long       __int64;
-#endif
 
 /* Pointers types. These are the same for emulator and library. */