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/time.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/win32/include/time.h b/win32/include/time.h
index 9852fc7..6c72e26 100644
--- a/win32/include/time.h
+++ b/win32/include/time.h
@@ -119,10 +119,10 @@ extern "C" {
 
 #define CLOCKS_PER_SEC 1000
 
-//!__TINYC__:   __MINGW_IMPORT int _daylight;
-//!__TINYC__:   __MINGW_IMPORT long _dstbias;
-//!__TINYC__:   __MINGW_IMPORT long _timezone;
-//!__TINYC__:   __MINGW_IMPORT char * _tzname[2];
+  __MINGW_IMPORT int _daylight;
+  __MINGW_IMPORT long _dstbias;
+  __MINGW_IMPORT long _timezone;
+  __MINGW_IMPORT char * _tzname[2];
   _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight);
   _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias);
   _CRTIMP errno_t __cdecl _get_timezone(long *_Timezone);
@@ -242,9 +242,10 @@ __CRT_INLINE time_t __cdecl time(time_t *_Time) { return _time64(_Time); }
 #if !defined(NO_OLDNAMES) || defined(_POSIX)
 #define CLK_TCK CLOCKS_PER_SEC
 
-  _CRTIMP extern int daylight;
-  _CRTIMP extern long timezone;
-  _CRTIMP extern char *tzname[2];
+  __MINGW_IMPORT int daylight;
+  __MINGW_IMPORT long dstbias;
+  __MINGW_IMPORT long timezone;
+  __MINGW_IMPORT char *tzname[2];
   void __cdecl tzset(void);
 #endif
 
-- 
cgit v1.3.1