summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-06-07 09:54:45 -0400
committerRich Felker <dalias@aerifal.cx>2013-06-07 09:54:45 -0400
commitf7244d205fc68d9ee8e28f89a8b5a680586a6117 (patch)
tree45baa73d6e97add9aef30f2eef737f1e6d076d00 /include
parente039db27c2b4298470861c57535eb91a3eb3b1a6 (diff)
downloadmusl-f7244d205fc68d9ee8e28f89a8b5a680586a6117.tar.gz
musl-f7244d205fc68d9ee8e28f89a8b5a680586a6117.tar.bz2
musl-f7244d205fc68d9ee8e28f89a8b5a680586a6117.tar.xz
musl-f7244d205fc68d9ee8e28f89a8b5a680586a6117.zip
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.
Diffstat (limited to 'include')
-rw-r--r--include/time.h9
1 files changed, 5 insertions, 4 deletions
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 <bits/alltypes.h>
+#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 *);