From 7670176dd23a4aee7875ea6c20f480d5f3c5a4e4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 28 Sep 2005 10:39:48 +0000 Subject: Define localtime_r() for Win32 using localtime() (which is thread-safe in 2005-09-28 Tor Lillqvist * em-format-html-display.c: Define localtime_r() for Win32 using localtime() (which is thread-safe in Microsoft's C library). svn path=/trunk/; revision=30398 --- mail/ChangeLog | 3 +++ mail/em-format-html-display.c | 10 ++++++++++ 2 files changed, 13 insertions(+) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index c415ac891a..8628b2deea 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -7,6 +7,9 @@ to literal ASCII strings, so just casefolding ASCII is enough. Also better for portability. + * em-format-html-display.c: Define localtime_r() for Win32 using + localtime() (which is thread-safe in Microsoft's C library). + 2005-09-28 Parthasarathi Susarla See bug ** 317329 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 0e054f1dca..d6719d361a 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -92,6 +92,16 @@ #include "e-attachment.h" #include "e-attachment-bar.h" +#ifdef G_OS_WIN32 +/* Undefine the similar macro from ,it doesn't check if + * localtime() returns NULL. + */ +#undef localtime_r + +/* The localtime() in Microsoft's C library is MT-safe */ +#define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0) +#endif + #define d(x) #define EFHD_TABLE_OPEN "" -- cgit