aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-10 04:09:46 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-10 04:09:46 +0800
commitb360395495a273356355959c1067c00abf18e2d4 (patch)
tree8316320e8e3c2078fafa9ced6a503197b5e6d6cd /e-util
parent5b5ac7a174676bf665b627b25d25ae9a9de689f4 (diff)
parenta16f08974d6955f843dddce3b9423c5349873488 (diff)
downloadgsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.gz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.bz2
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.lz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.xz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.zst
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.zip
Merge branch 'express2' into express2-reduced-preferences
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-datetime-format.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index ec3e4fb8fe..0595d58add 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -29,6 +29,9 @@
#define KEYS_GROUPNAME "formats"
#ifdef G_OS_WIN32
+#ifdef localtime_r
+#undef localtime_r
+#endif
/* The localtime() in Microsoft's C library *is* thread-safe */
#define localtime_r(timep, result) (localtime (timep) ? memcpy ((result), localtime (timep), sizeof (*(result))) : 0)
#endif