summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-25 22:41:27 +0000
committerRoland McGrath <roland@gnu.org>1996-07-25 22:41:27 +0000
commit4311b2a60c3124513b3d45fa0a53a80d14bc1c90 (patch)
treea35411345a2f0490dd7b5e503c1029b514457f95 /time
parentc7fd2f4783d87f29f89709e11dc613b0cb04f0dc (diff)
downloadglibc-4311b2a60c3124513b3d45fa0a53a80d14bc1c90.tar.gz
glibc-4311b2a60c3124513b3d45fa0a53a80d14bc1c90.tar.xz
glibc-4311b2a60c3124513b3d45fa0a53a80d14bc1c90.zip
Thu Jul 25 00:53:06 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
	* sysdeps/unix/sysv/linux/configure.in (LIBC_LINUX_VERSION): New
	macro, now put the needed Linux version just once, here; update to
	needing linux-2.0.3 headers.
	(libc_cv_linuxVER): New macro derived from that.
	(kernel header check): Use those macros and some m4 magic to replace
	hard-coded `201' and `2.0.1' in several places.

	* Makerules ($(libdir)/libc.so): Fix typos in generated comment.

Wed Jul 24 17:02:30 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/localtime.c: Move lock variable declaration to end of
	variable declarations since if is a dummy macro the ; at the
	end terminates the variable section of the function.

	* time/tzset.c: Undefine `tzset' before function declaration.
	Use `weak_function' macro instead of `weak_symbol'.

Wed Jul 24 18:57:33 1996  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/strtouq.c: Additional weak alias is `strtoull', not
	`strotull'.

Wed Jul 24 18:26:23 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/C-ctype.c: Increment number of fields after change
	from Wed Jun 19 03:24:58 1996.
Diffstat (limited to 'time')
-rw-r--r--time/localtime.c2
-rw-r--r--time/tzset.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/time/localtime.c b/time/localtime.c
index 9dff89ce74..3800d8b5b0 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -40,13 +40,13 @@ __localtime_r (timer, tp)
   /* This lock is defined in tzset.c and locks all the data defined there
      and in tzfile.c; the internal functions do no locking themselves.
      This lock is only taken here and in `tzset'.  */
-  __libc_lock_define (extern, __tzset_lock);
   extern int __tzset_run, __use_tzfile;
   extern int __tz_compute __P ((time_t timer, struct tm *tp));
   extern int __tzfile_compute __P ((time_t timer,
 				    long int *leap_correct, int *leap_hit));
   long int leap_correction;
   int leap_extra_secs;
+  __libc_lock_define (extern, __tzset_lock);
 
   if (timer == NULL)
     {
diff --git a/time/tzset.c b/time/tzset.c
index a4fa8e358b..8323c7be6d 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -490,9 +490,12 @@ DEFUN(__tz_compute, (timer, tm),
 __libc_lock_define (, __tzset_lock)
 
 /* Reinterpret the TZ environment variable and set `tzname'.  */
+#undef tzset
 
-weak_symbol (tzset)
 void
+#ifdef weak_function
+weak_function
+#endif
 tzset (void)
 {
   __libc_lock_lock (__tzset_lock);