libical r659 - in trunk: . src/libical

[mcrha svn gnome org]

Author: mcrha
Date: Tue Dec 23 21:42:56 2008
New Revision: 659
URL: http://svn.gnome.org/viewvc/libical?rev=659&view=rev

Log:
2008-12-23  Milan Crha  <mcrha redhat com>

	** Part of fix for bug #564652

	* src/libical/icaltime.c: (icaltime_as_timet_with_zone): Call 'tzset'
	always, thus any later calls to localtime_r will you actual system
	time zone and not the last one we set here.



Modified:
   trunk/ChangeLog
   trunk/src/libical/icaltime.c

Modified: trunk/src/libical/icaltime.c
==============================================================================
--- trunk/src/libical/icaltime.c	(original)
+++ trunk/src/libical/icaltime.c	Tue Dec 23 21:42:56 2008
@@ -428,15 +428,11 @@
     
     /* Set TZ to UTC and use mktime to convert to a time_t. */
     old_tz = set_tz ("UTC");
-#ifdef WIN32
     tzset ();
-#endif
 
     t = mktime (&stm);
     unset_tz (old_tz);
-#ifdef WIN32
     tzset ();
-#endif
 
 #ifdef HAVE_PTHREAD
     pthread_mutex_unlock (&tzid_mutex);