aboutsummaryrefslogtreecommitdiff
path: root/time/tzset.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-02 21:48:45 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-02 21:48:45 +0000
commite3e35cfc95cbfdc7829a5717af244d978d309f42 (patch)
tree562c7b56fae088592433bbb61e54c386b5f93ff9 /time/tzset.c
parent160698e277bb4bc9a402c0f044289fd04f958089 (diff)
downloadglibc-e3e35cfc95cbfdc7829a5717af244d978d309f42.zip
glibc-e3e35cfc95cbfdc7829a5717af244d978d309f42.tar.gz
glibc-e3e35cfc95cbfdc7829a5717af244d978d309f42.tar.bz2
Update.
* elf/Versions [libc, GLIBC_2.01]: Add _dl_global_scope_alloc. * elf/dl-open.c (_dl_global_scope_alloc): Move definition to * elf/dl-deps.c: ...here. * elf/dl-open.c (dl_open_worker): Call _dl_map_object_deps with new parameter and expect result. Remove code handling RTLD_GLOBAL. Add return value of _dl_map_object_deps to _dl_main_searchlist->r_nlist. * elf/dl-deps.c (_dl_map_object_deps): Change to return value. If we parameter GLOBAL is nonzero add object and dependencies to the global scope. * elf/ldsodefs.h: Adapt prototype for _dl_map_object_deps. * elf/rtld.c (dl_main): Call _dl_map_object_deps with new parameter. Mark all objects as in global scope. * elf/dl-object.c (_dl_new_object): Initialize l_global to zero. * sysdeps/unix/sysv/linux/bits/sockunion.h: Add Econet support. * sysdeps/unix/sysv/linux/i386/sysdep.h: Add .L prefix to symbols used in macro magic. 1998-11-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/netatalk/at.h: Include <linux/atalk.h> before <sys/socket.h> to make sockaddr_at available to <sys/socket.h>. * posix/glob.h: Remove __P from parameter lists of declarations. 1998-11-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/tzset.c (tz_compute): Remove unused parameter timer. Change caller. 1998-11-02 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/generic/bits/types.h (__ipc_pid_t): New typedef. 1998-11-02 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'time/tzset.c')
-rw-r--r--time/tzset.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/time/tzset.c b/time/tzset.c
index 92e2208..60188c2 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -84,7 +84,7 @@ static tz_rule tz_rules[2];
static int compute_change __P ((tz_rule *rule, int year)) internal_function;
-static int tz_compute __P ((time_t timer, const struct tm *tm))
+static int tz_compute __P ((const struct tm *tm))
internal_function;
static void tzset_internal __P ((int always)) internal_function;
@@ -508,13 +508,12 @@ compute_change (rule, year)
}
-/* Figure out the correct timezone for *TIMER and TM (which must be the same)
- and set `__tzname', `__timezone', and `__daylight' accordingly.
- Return nonzero on success, zero on failure. */
+/* Figure out the correct timezone for TM and set `__tzname',
+ `__timezone', and `__daylight' accordingly. Return nonzero on
+ success, zero on failure. */
static int
internal_function
-tz_compute (timer, tm)
- time_t timer;
+tz_compute (tm)
const struct tm *tm;
{
if (! compute_change (&tz_rules[0], 1900 + tm->tm_year)
@@ -597,7 +596,7 @@ __tz_convert (const time_t *timer, int use_localtime, struct tm *tp)
}
else
{
- if (! (__offtime (timer, 0, tp) && tz_compute (*timer, tp)))
+ if (! (__offtime (timer, 0, tp) && tz_compute (tp)))
tp = NULL;
leap_correction = 0L;
leap_extra_secs = 0;