--- mstools/h/windef.h	2018/08/09 18:21:11	1.1.1.3
+++ mstools/h/windef.h	2018/08/09 18:23:06	1.1.1.4
@@ -1,6 +1,6 @@
-/*++ BUILD Version: 0001    // Increment this if a change has global effects
+/*++ BUILD Version: 0001    Increment this if a change has global effects
 
-Copyright (c) 1985-91, Microsoft Corporation
+Copyright (c) 1985-1993, Microsoft Corporation
 
 Module Name:
 
@@ -19,30 +19,29 @@ Abstract:
 extern "C" {
 #endif
 
-// the typedef of ULONG should go away here.  It will continue to be
-// defined in windows\inc\windefp.h
-
-#ifndef BASETYPE_ULONG
-#define BASETYPE_ULONG
-typedef unsigned long ULONG;
-typedef ULONG *PULONG;
-#endif
-
-// BASETYPES is defined in ntdef.h if these types are already defined
+/*
+ * BASETYPES is defined in ntdef.h if these types are already defined
+ */
 
 #ifndef BASETYPES
 #define BASETYPES
+typedef unsigned long ULONG;
+typedef ULONG *PULONG;
 typedef unsigned short USHORT;
 typedef USHORT *PUSHORT;
 typedef unsigned char UCHAR;
 typedef UCHAR *PUCHAR;
 typedef char *PSZ;
-#endif  // !BASETYPES
+#endif  /* !BASETYPES */
 
 #define MAX_PATH          260
 
 #ifndef NULL
-#define NULL                0
+#ifdef __cplusplus
+#define NULL	0
+#else
+#define NULL	((void *)0)
+#endif
 #endif
 
 #ifndef FALSE
@@ -65,9 +64,18 @@ typedef char *PSZ;
 #define OPTIONAL
 #endif
 
+#undef far
+#undef near
+#undef pascal
+
 #define far
 #define near
+#if (_MSC_VER >= 800)
+#define pascal __stdcall
+#else
 #define pascal
+#endif
+
 #ifdef DOSWIN32
 #define cdecl _cdecl
 #ifndef CDECL
@@ -80,19 +88,20 @@ typedef char *PSZ;
 #endif
 #endif
 
-#if (defined(i386) && ((!defined(I386_HOST)) || (I386_HOST != 0))) || \
-    (!defined(i386) && defined(I386_HOST) && (I386_HOST != 0))
+#if (_MSC_VER >= 800)
 #define CALLBACK    __stdcall
 #define WINAPI      __stdcall
+#define WINAPIV     __cdecl
 #define APIENTRY    WINAPI
 #define APIPRIVATE  __stdcall
 #define PASCAL      __stdcall
 #else
 #define CALLBACK
 #define WINAPI
+#define WINAPIV
 #define APIENTRY    WINAPI
 #define APIPRIVATE
-#define PASCAL              pascal
+#define PASCAL      pascal
 #endif
 
 #define FAR                 far
@@ -119,6 +128,7 @@ typedef long far            *LPLONG;
 typedef DWORD near          *PDWORD;
 typedef DWORD far           *LPDWORD;
 typedef void far            *LPVOID;
+typedef CONST void far      *LPCVOID;
 
 typedef int                 INT;
 typedef unsigned int        UINT;
@@ -126,7 +136,7 @@ typedef unsigned int        *PUINT;
 
 #ifndef NT_INCLUDED
 #include <winnt.h>
-#endif // NT_INCLUDED
+#endif /* NT_INCLUDED */
 
 /* Types use for passing & returning polymorphic values */
 typedef UINT WPARAM;
@@ -166,18 +176,12 @@ typedef HANDLE              HGLOBAL;
 typedef HANDLE              HLOCAL;
 typedef HANDLE              GLOBALHANDLE;
 typedef HANDLE              LOCALHANDLE;
-#ifdef STRICT
-typedef void (FAR WINAPI *FARPROC)(void);      // should be removed some day!!!
-typedef void (NEAR WINAPI *NEARPROC)(void);
-typedef void (WINAPI *PROC)(void);             // new 32-bit version
-#else
-typedef int (FAR WINAPI *FARPROC)();      // should be removed some day!!!
+typedef int (FAR WINAPI *FARPROC)();
 typedef int (NEAR WINAPI *NEARPROC)();
-typedef int (WINAPI *PROC)();             // new 32-bit version
-#endif
+typedef int (WINAPI *PROC)();
 
 #ifdef STRICT
-typedef const void NEAR* HGDIOBJ;
+typedef void NEAR* HGDIOBJ;
 #else
 DECLARE_HANDLE(HGDIOBJ);
 #endif
@@ -188,8 +192,6 @@ DECLARE_HANDLE(HBRUSH);
 DECLARE_HANDLE(HDC);
 DECLARE_HANDLE(HDESK);
 DECLARE_HANDLE(HENHMETAFILE);
-DECLARE_HANDLE(HMF);
-DECLARE_HANDLE(HEMF);
 DECLARE_HANDLE(HFONT);
 DECLARE_HANDLE(HICON);
 DECLARE_HANDLE(HMENU);
@@ -290,4 +292,4 @@ typedef struct tagPOINTS
 }
 #endif
 
-#endif // _WINDEF_
+#endif /* _WINDEF_ */