oslib-win32: use localtime_r/gmtime_r that is provided by MinGW

Recent MinGW-w64 contains their own localtime_r() and gmtime_r(). But
it is only enabled under specific including order.
This issue is resolved by 4d9310f427b477a126f6f2006c3a73b9764948b6 in
upstream. But it is dependent on other commits that contain complex
modifications.
So now, we choose simple solution for it - just re-arrange header
including order.

Change-Id: Ie1a8d46baa9a5e8f1140362faa81567b1ba257a5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/include/qemu-common.h b/include/qemu-common.h
index fb3da6ca22f38719205c818975ff4e81744faf44..e4345f9cfc4df15013fb94dfa12a03dbb7571958 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -32,10 +32,13 @@
 #include <strings.h>
 #include <inttypes.h>
 #include <limits.h>
+// CONFIG_MARU MODIFICATION
+// recent MinGW-w64 provides gmtime_r(), localtime_r(). we use them.
+// for that, unistd.h should be included before time.h
+#include <unistd.h>
 #include <time.h>
 #include <ctype.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>

diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
index de356e300699565250e64a59725137e7b7eb0ec6..795da47ecf4cb58b6ea70c298fd0e7a332512cf4 100644 (file)
--- a/include/sysemu/os-win32.h
+++ b/include/sysemu/os-win32.h
@@ -72,18 +72,14 @@
 #define sigsetjmp(env, savemask) setjmp(env)
 #define siglongjmp(env, val) longjmp(env, val)
 
-/* Missing POSIX functions. Don't use MinGW-w64 macros. */
 // CONFIG_MARU MODIFICATION
-#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#endif
+// recent MinGW-w64 provides gmtime_r(), localtime_r(). we use them.
+#if 0
+/* Missing POSIX functions. Don't use MinGW-w64 macros. */
 #undef gmtime_r
 struct tm *gmtime_r(const time_t *timep, struct tm *result);
 #undef localtime_r
 struct tm *localtime_r(const time_t *timep, struct tm *result);
-#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
-#pragma GCC diagnostic pop
 #endif
 
 

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 23d934a6c009c888bc271011032d3d8396c25296..217f28a201c24c3290c9662ad602277668f54407 100644 (file)
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -110,6 +110,9 @@ void qemu_anon_ram_free(void *ptr, size_t size)
     }
 }
 
+// CONFIG_MARU MODIFICATION
+// recent MinGW-w64 provides gmtime_r(), localtime_r(). we use them.
+#if 0
 /* FIXME: add proper locking */
 struct tm *gmtime_r(const time_t *timep, struct tm *result)
 {
@@ -133,6 +136,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
     }
     return p;
 }
+#endif
 
 void qemu_set_block(int fd)
 {