From: Rich Felker Date: Fri, 7 Jun 2013 13:54:45 +0000 (-0400) Subject: improve handling of nonstandard fields in struct tm X-Git-Tag: v0.9.11~39 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f7244d205fc68d9ee8e28f89a8b5a680586a6117;p=oweals%2Fmusl.git improve handling of nonstandard fields in struct tm defining tm_gmtoff and tm_zone as macros was breaking some application code that used these names for its own purposes. --- diff --git a/include/time.h b/include/time.h index aa4efff4..09a65cff 100644 --- a/include/time.h +++ b/include/time.h @@ -25,6 +25,11 @@ extern "C" { #include +#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) +#define __tm_gmtoff tm_gmtoff +#define __tm_zone tm_zone +#endif + struct tm { int tm_sec; @@ -39,10 +44,6 @@ struct tm long __tm_gmtoff; const char *__tm_zone; }; -#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) -#define tm_gmtoff __tm_gmtoff -#define tm_zone __tm_zone -#endif clock_t clock (void); time_t time (time_t *);