time_t is 64 bits in all the newer Microsoft C libraries, not just 64-bit

2008-09-16  Tor Lillqvist  <tml@novell.com>

	* glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits in all
	the newer Microsoft C libraries, not just 64-bit ones. So to avoid
	crash if compiled with newer MSVSes, use a separate time_t
	variable in all cases on Windows.

svn path=/trunk/; revision=7496

diff --git a/ChangeLog b/ChangeLog
index 52014f7..0c0caaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-16  Tor Lillqvist  <tml@novell.com>
 
+       * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits in all
+       the newer Microsoft C libraries, not just 64-bit ones. So to avoid
+       crash if compiled with newer MSVSes, use a separate time_t
+       variable in all cases on Windows.
+
        * glib/gbacktrace.h: Define G_BREAKPOINT() also for 64-bit MSVC,
        using the __debugbreak() intrinsic.
 

diff --git a/glib/gtimer.c b/glib/gtimer.c
index bfc559a..3e9a1a6 100644 (file)
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -422,7 +422,7 @@ g_time_val_to_iso8601 (GTimeVal *time_)
   
   g_return_val_if_fail (time_->tv_usec >= 0 && time_->tv_usec < G_USEC_PER_SEC, NULL);
 
-#ifdef _WIN64
+#ifdef _WIN32
   {
     time_t secs = time_->tv_sec;
     tm = gmtime (&secs);