diff options
author | Ulrich Drepper <drepper@redhat.com> | 2007-03-17 17:09:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2007-03-17 17:09:13 +0000 |
commit | 965cba048c978a2841c537383ed3408259c918f3 (patch) | |
tree | e06867399d7e0026645f2a9f69d836629dcc283e /elf/dl-dst.h | |
parent | b037a293a48718af30d706c2e18c929d0e69a621 (diff) | |
download | glibc-965cba048c978a2841c537383ed3408259c918f3.tar.gz glibc-965cba048c978a2841c537383ed3408259c918f3.tar.xz glibc-965cba048c978a2841c537383ed3408259c918f3.zip |
* elf/dl-open.c (dl_open_worker): Declare l in 2 different cvs/fedora-glibc-20070317T2130
smaller scopes. * elf/dl-dst.h (DL_DST_REQ_STATIC): Add l as macro argument. (DL_DST_REQUIRED): Adjust user. * include/dlfcn.h (struct link_map): New forward decl. * inet/getnameinfo.c: Include stddef.h. (getnameinfo): Use offsetof. * time/tst-mktime2.c (do_test): Don't rely on signed wrap. * stdio-common/vfprintf.c (_itoa): Undef before redefining. * string/strerror_l.c: Include stdlib.h.
Diffstat (limited to 'elf/dl-dst.h')
-rw-r--r-- | elf/dl-dst.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/elf/dl-dst.h b/elf/dl-dst.h index 83d16bdb0e..175b7cd195 100644 --- a/elf/dl-dst.h +++ b/elf/dl-dst.h @@ -1,5 +1,6 @@ /* Handling of dynamic sring tokens. - Copyright (C) 1999,2001,2002,2003,2004,2006 Free Software Foundation, Inc. + Copyright (C) 1999,2001,2002,2003,2004,2006,2007 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -50,7 +51,7 @@ \ First get the origin string if it is not available yet. \ This can only happen for the map of the executable. */ \ - DL_DST_REQ_STATIC \ + DL_DST_REQ_STATIC (l) \ if ((l)->l_origin == NULL) \ { \ assert ((l)->l_name[0] == '\0'); \ @@ -68,9 +69,9 @@ __len; }) #ifdef SHARED -# define DL_DST_REQ_STATIC /* nothing */ +# define DL_DST_REQ_STATIC(l) /* nothing */ #else -# define DL_DST_REQ_STATIC \ +# define DL_DST_REQ_STATIC(l) \ if ((l) == NULL) \ { \ const char *origin = _dl_get_origin (); \ |