Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / netinstall / win32.h

diff --git a/netinstall/win32.h b/netinstall/win32.h
index d1ee070..7e1c4d1 100644 (file)
--- a/netinstall/win32.h
+++ b/netinstall/win32.h
@@ -21,26 +21,8 @@
 #ifndef _MINI_WIN32_
 #define _MINI_WIN32_
 
-#define _UNION_NAME(x)
-#define _STRUCT_NAME(x)
 #define NOCOMATTRIBUTE
 
-#include <stdarg.h>
-#ifdef WIN32_NATIVE
-/* MSVC is barking with the list above, something else is missing, so
-   I'm using <windows.h> and lean-n-mean. FP, 2000-23-12 */
-#include <windows.h>
-#endif
-#include <windef.h>
-#include <basetyps.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wininet.h>
-#include <winreg.h>
-
-#include <windowsx.h>
-
 /* Cope with native win32 & mingw differences.  Written by F. Popineau
    <Fabrice.Popineau@supelec.fr> */
 #ifdef WIN32_NATIVE
@@ -50,6 +32,14 @@
 #  define strnicmp _strnicmp
 #endif
 
+#include <stdarg.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <wininet.h>
+#include <windowsx.h>
+
 #ifndef CDECL
 #define CDECL __cdecl
 #endif