mirror of git://git.musl-libc.org/musl
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.
This commit is contained in:
parent
e039db27c2
commit
f7244d205f
|
@ -25,6 +25,11 @@ extern "C" {
|
||||||
|
|
||||||
#include <bits/alltypes.h>
|
#include <bits/alltypes.h>
|
||||||
|
|
||||||
|
#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
|
||||||
|
#define __tm_gmtoff tm_gmtoff
|
||||||
|
#define __tm_zone tm_zone
|
||||||
|
#endif
|
||||||
|
|
||||||
struct tm
|
struct tm
|
||||||
{
|
{
|
||||||
int tm_sec;
|
int tm_sec;
|
||||||
|
@ -39,10 +44,6 @@ struct tm
|
||||||
long __tm_gmtoff;
|
long __tm_gmtoff;
|
||||||
const char *__tm_zone;
|
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);
|
clock_t clock (void);
|
||||||
time_t time (time_t *);
|
time_t time (time_t *);
|
||||||
|
|
Loading…
Reference in New Issue