From 4abef27cb7e388aed0027ed2b7d989f1833d5999 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Oct 2000 18:36:31 +0000 Subject: [PATCH] Update. * sysdeps/generic/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): Little cleanup. * timezone/Makefile: Define HAVE_GETTEXT for zdump.c, zic.c, --- ChangeLog | 4 +++- sysdeps/generic/dl-sysdep.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4334dfa4d..bb275df0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2000-10-16 Ulrich Drepper + * sysdeps/generic/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): Little cleanup. + * sysdeps/i386/fpu/libm-test-ulps: Update for changes in libm-test.inc. 2000-10-16 Jakub Jelinek @@ -25,7 +27,7 @@ 2000-10-16 Ulrich Drepper - * timezone/Makefile: Define HAVE_GETTEXT fir zdump.c, zic.c, + * timezone/Makefile: Define HAVE_GETTEXT for zdump.c, zic.c, ialloc.c, and scheck.c. * malloc/obstack.c: Always include for glibc. * posix/getopt.c: Likewise. diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 889a216d4a..4a9ca27182 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -61,14 +61,14 @@ unsigned long int _dl_hwcap_mask = HWCAP_IMPORTANT; #ifndef DL_FIND_ARG_COMPONENTS # define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \ - do { \ - void **_tmp; \ - (argc) = *(long *) cookie; \ - (argv) = (char **) cookie + 1; \ - (envp) = (argv) + (argc) + 1; \ - for (_tmp = (void **) (envp); *_tmp; ++_tmp) \ - continue; \ - (auxp) = (void *) ++_tmp; \ + do { \ + void **_tmp; \ + (argc) = *(long int *) cookie; \ + (argv) = (char **) ((long int *) cookie + 1); \ + (envp) = (argv) + (argc) + 1; \ + for (_tmp = (void **) (envp); *_tmp; ++_tmp) \ + continue; \ + (auxp) = (void *) ++_tmp; \ } while (0) #endif