diff options
| -rw-r--r-- | mail/em-composer-utils.c | 5 | ||||
| -rw-r--r-- | mail/message-list.c | 11 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/e-timezone-dialog.c | 7 |
3 files changed, 13 insertions, 10 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 3bd5021f12..7e8d2b1dad 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -60,10 +60,9 @@ #include "em-event.h" #ifdef G_OS_WIN32 -/* Undef the similar macro from pthread.h, it doesn't check if - * gmtime() returns NULL. - */ +#ifdef gmtime_r #undef gmtime_r +#endif /* The gmtime() in Microsoft's C library is MT-safe */ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) diff --git a/mail/message-list.c b/mail/message-list.c index 8662999704..321edc3de3 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -75,12 +75,15 @@ #endif #ifdef G_OS_WIN32 -/* Undefine the similar macro from <pthread.h>,it doesn't check if - * localtime() returns NULL. - */ +#ifdef gmtime_r +#undef gmtime_r +#endif +#ifdef localtime_r #undef localtime_r +#endif -/* The localtime() in Microsoft's C library is MT-safe */ +/* The gmtime() and localtime() in Microsoft's C library are MT-safe */ +#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0) #endif diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 250cc1d32d..734301ebee 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -37,11 +37,12 @@ #include "e-timezone-dialog.h" #ifdef G_OS_WIN32 -/* Undef the similar macros from pthread.h, they don't check if - * gmtime() and localtime() return NULL. - */ +#ifdef gmtime_r #undef gmtime_r +#endif +#ifdef localtime_r #undef localtime_r +#endif /* The gmtime() and localtime() in Microsoft's C library are MT-safe */ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) |