diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-04-10 01:21:32 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-04-10 01:21:32 +0800 |
| commit | a16f08974d6955f843dddce3b9423c5349873488 (patch) | |
| tree | 864c537265450b65c47cb4b801817cd9eede5787 /e-util | |
| parent | 5b397348258994539b452006e988be78a43a2fae (diff) | |
| parent | ad1de0aa0889edaa0ad9bc41c170fa84ec5536f2 (diff) | |
| download | gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.gz gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.zst gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.zip | |
Merge gnome-2-30 into express2 to get bugfixes
Note that express2 got some documentation for EExtensible and friends,
and that documentation is not in gnome-2-30 yet. We need to cherry-pick
those commits into gnome-2-30 and elsewhere.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-datetime-format.c | 3 |
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 |