From 7b573dc239a576da37f288c9ba39df5c0854b41d Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Mon, 11 Jul 2011 18:44:47 +0200
Subject: win32/include: enable _timezone etc variables.

which live in msvcrt.dll and need __declspec(import) which
works by now.

Also:
- _mingw.h: conditionally define WIN32_LEAN_AND_MEAN
- malloc.h: don't undef alloca
---
 win32/include/_mingw.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'win32/include/_mingw.h')

diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index e8e9561..00ff2fc 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -38,9 +38,8 @@
 #define __unaligned __attribute__((packed))
 #define __fastcall __attribute__((fastcall))
 
-// #define __MINGW_IMPORT extern __declspec(dllimport)
+#define __MINGW_IMPORT extern __declspec(dllimport)
 #undef _MSVCRT_
-#undef __MINGW_IMPORT
 #define __MINGW_ATTRIB_NORETURN
 #define __MINGW_ATTRIB_CONST
 #define __MINGW_ATTRIB_DEPRECATED
@@ -124,10 +123,12 @@ typedef struct localeinfo_struct _locale_tstruct,*_locale_t;
 #define _ANONYMOUS_STRUCT
 #define DECLSPEC_NORETURN
 #define DECLARE_STDCALL_P(type) __stdcall type
-#define WIN32_LEAN_AND_MEAN
 #define NOSERVICE 1
 #define NOMCX 1
 #define NOIME 1
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN 1
+#endif
 #ifndef WINVER
 # define WINVER 0x0502
 #endif
-- 
cgit v1.3.1