Merge from trunk rev. 4927:
Jonathan Yong <jon_y@users.sourceforge.net>
* _mingw.h: Remove _FILE_OFFSET_BITS check to define _USE_32BIT_TIME_T,
32bit time_t for win32 by default.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@4936 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index 8aa82a7..75bbbe6 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
/* Do not edit. Autogenerated. */
-#define __MINGW_W64_REV "4918"
-#define __MINGW_W64_REV_STAMP "2012-03-20"
+#define __MINGW_W64_REV "4936"
+#define __MINGW_W64_REV_STAMP "2012-04-03"
diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog
index d8095aa..70745f8 100644
--- a/mingw-w64-headers/crt/ChangeLog
+++ b/mingw-w64-headers/crt/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-03 Ozkan Sezer <sezeroz@gmail.com>
+
+ Merge from trunk rev. 4927:
+ Jonathan Yong <jon_y@users.sourceforge.net>
+ * _mingw.h: Remove _FILE_OFFSET_BITS check to define _USE_32BIT_TIME_T,
+ 32bit time_t for win32 by default.
+
2012-01-17 Ozkan Sezer <sezeroz@gmail.com>
* time.h: Don't include pthread_time.h when we are compiling
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index c1c77d8..a04ca88 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -452,7 +452,7 @@
#endif /* _WINT_T */
#endif /* _WCTYPE_T_DEFINED */
-#if defined (_WIN32) && !(defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT)
+#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT)/* && !(defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)*/
#ifndef _USE_32BIT_TIME_T
#define _USE_32BIT_TIME_T
#endif
