glib r7496 - in trunk: . glib

[tml svn gnome org]

Author: tml
Date: Mon Sep 15 22:52:12 2008
New Revision: 7496
URL: http://svn.gnome.org/viewvc/glib?rev=7496&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/glib/gtimer.c

Modified: trunk/glib/gtimer.c
==============================================================================
--- trunk/glib/gtimer.c	(original)
+++ trunk/glib/gtimer.c	Mon Sep 15 22:52:12 2008
@@ -422,7 +422,7 @@
   
   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);