diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-26 08:41:09 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-26 08:41:09 +0000 |
| commit | 20cff295659e9bd1bee2c316ee17a53cad693ea2 (patch) | |
| tree | d3681139c0c158406063fc9a1c590e041de14538 /libc/misc/time | |
| parent | d8ea341e64250c2f4636c559562e8904037eda74 (diff) | |
- revert 24148:24151
Diffstat (limited to 'libc/misc/time')
| -rw-r--r-- | libc/misc/time/time.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index 4bc1aafd9..ae800e1ca 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -1747,12 +1747,9 @@ static const char vals[] = { #define DEFAULT_2007_RULES (vals + 38) /* Initialize to UTC. */ -int __daylight attribute_hidden = 0; -weak_alias(__daylight, daylight) -long __timezone attribute_hidden = 0; -weak_alias(__timezone, timezone) -char *__tzname[2] attribute_hidden = { (char *) UTC, (char *) (UTC-1) }; -weak_alias(__tzname, tzname) +int daylight = 0; +long timezone = 0; +char *tzname[2] = { (char *) UTC, (char *) (UTC-1) }; __UCLIBC_MUTEX_INIT(_time_tzlock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP); @@ -2062,10 +2059,10 @@ SKIP_OFFSET: memcpy(_time_tzinfo, new_rules, sizeof(new_rules)); DONE: - __tzname[0] = _time_tzinfo[0].tzname; - __tzname[1] = _time_tzinfo[1].tzname; - __daylight = !!_time_tzinfo[1].tzname[0]; - __timezone = _time_tzinfo[0].gmt_offset; + tzname[0] = _time_tzinfo[0].tzname; + tzname[1] = _time_tzinfo[1].tzname; + daylight = !!_time_tzinfo[1].tzname[0]; + timezone = _time_tzinfo[0].gmt_offset; #if defined(__UCLIBC_HAS_TZ_FILE__) || defined(__UCLIBC_HAS_TZ_CACHING__) FAST_DONE: |