summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time/tzset.c14
2 files changed, 9 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c544f0043a..3fc196e18d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 19 18:40:11 1995 Brendan Kehoe (brendan@zen.org)
+
+ * time/tzset.c (__tzname, __daylight, __timezone): Don't check
+ HAVE_WEAK_SYBMOLS for doing weak_alias.
+
Tue Apr 18 14:00:19 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* configure.in (libc_cv_asm_global_directive): New check to define
diff --git a/time/tzset.c b/time/tzset.c
index 3eac151f22..ccaffd9c4a 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -36,20 +36,14 @@ extern void EXFUN(__tzfile_default, (char *std AND char *dst AND
long int stdoff AND long int dstoff));
extern int EXFUN(__tzfile_compute, (time_t, struct tm));
-#ifndef HAVE_WEAK_SYMBOLS
-#define __tzname tzname
-#define __daylight daylight
-#define __timezone timezone
-#else
-weak_alias (__tzname, tzname)
-weak_alias (__daylight, daylight)
-weak_alias (__timezone, timezone)
-#endif
-
char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
int __daylight = 0;
long int __timezone = 0L;
+weak_alias (__tzname, tzname)
+weak_alias (__daylight, daylight)
+weak_alias (__timezone, timezone)
+
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))