From: Earnie Boyd <earnie@users.sourceforge.net>
Date: Tue, 28 May 2013 11:50:24 +0000 (-0400)
Subject: Correct use of MSVCRT_VERSION.
X-Git-Tag: 4.0.0~19
X-Git-Url: http://git.osdn.net/view?p=mingw%2Fmingw-org-wsl.git;a=commitdiff_plain;h=f4dd79b7b8bb792cfdb09c6ace052f2ecb300e56

Correct use of MSVCRT_VERSION.
---

diff --git a/ChangeLog b/ChangeLog
index a2d857b..a1923a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,20 @@
+2013-05-28  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* include/time.h: Correct use of MSVCRT_VERSION.
+
 2013-05-27  Earnie Boyd  <earnie@users.sourceforge.net>
 
-	* types.h (_USE_32BIT_TIME_T): Rework the definitions controlled by
-	_USE_32BIT_TIME_T in light of MSVCRT_VERSION being different with
-	differing OS versions.
-	* time.h (_USE_32BIT_TIME_T): Ditto.
-	* stat.h (_USE_32BIT_TIME_T): Ditto.
-	* wchar.h (_USE_32BIT_TIME_T): Ditto.
-	* _mingw.h (_USE_32BIT_TIME_T): Issue a warning when _USE_32BIT_TIME_T
-	is enabled and MSVCRT_VERSION value does not support it.
-	* msvcrt.def.in: Always define all definitions in light of MSVCRT.DLL
+	* include/sys/types.h (_USE_32BIT_TIME_T): Rework the definitions
+	controlled by _USE_32BIT_TIME_T in light of MSVCRT_VERSION being
+	different with differing OS versions.
+	* include/time.h (_USE_32BIT_TIME_T): Ditto.
+	* include/sys/stat.h (_USE_32BIT_TIME_T): Ditto.
+	* include/wchar.h (_USE_32BIT_TIME_T): Ditto.
+	* include/_mingw.h (_USE_32BIT_TIME_T): Issue a warning when
+	_USE_32BIT_TIME_T is enabled and MSVCRT_VERSION value does not
+	support it.
+	* lib/lib32/msvcrt.def.in: Always define all definitions in light of
+	MSVCRT.DLL
 	being different versions on differing OS.
 	* TODO: Add a note about needing a warning when a function is being
 	used but not defined within the MSVCRT_VERSION value.
diff --git a/include/time.h b/include/time.h
index d6c57e1..571b14e 100644
--- a/include/time.h
+++ b/include/time.h
@@ -143,7 +143,7 @@ _CRTIMP struct tm*  __cdecl __MINGW_NOTHROW _gmtime64 (const __time64_t*);
 _CRTIMP struct tm*  __cdecl __MINGW_NOTHROW _localtime64 (const __time64_t*);
 
 /* These require newer versions of msvcrt.dll (8.00 or higher). */
-#ifdef MSVCRT_VERSION >= 800
+#if MSVCRT_VERSION >= 800
 _CRTIMP __time32_t __cdecl __MINGW_NOTHROW	_time32     (__time32_t*);
 _CRTIMP double	   __cdecl __MINGW_NOTHROW	_difftime32 (__time32_t, __time32_t);
 _CRTIMP double	   __cdecl __MINGW_NOTHROW	_difftime64 (__time64_t, __time64_t);