diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-04 14:49:08 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-04 14:49:08 +0100 |
| commit | 16a7541439c5ae36181e7f454b5a81f8c25aecf4 (patch) | |
| tree | fca6aa176c1479ed6c3b792692473675b5ab4613 /include | |
| parent | 600f9723fc372c37adfa171aae8e1f62cb5d5bba (diff) | |
| parent | c10f8866e5b673b6f41dcb14c8ea319f5e545b1a (diff) | |
| download | glibc-16a7541439c5ae36181e7f454b5a81f8c25aecf4.tar.gz | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/link.h | 8 | ||||
| -rw-r--r-- | include/stdlib.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/link.h b/include/link.h index 4b9978ad61..26c67438f0 100644 --- a/include/link.h +++ b/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. - Copyright (C) 1995-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2007, 2009 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 @@ -180,7 +180,6 @@ struct link_map unsigned int l_need_tls_init:1; /* Nonzero if GL(dl_init_static_tls) should be called on this link map when relocation finishes. */ - unsigned int l_used:1; /* Nonzero if the DSO is used. */ unsigned int l_auditing:1; /* Nonzero if the DSO is used in auditing. */ unsigned int l_audit_any_plt:1; /* Nonzero if at least one audit module is interested in the PLT interception.*/ @@ -239,12 +238,15 @@ struct link_map struct link_map **l_initfini; /* List of the dependencies introduced through symbol binding. */ - unsigned int l_reldepsmax; struct link_map_reldeps { unsigned int act; struct link_map *list[]; } *l_reldeps; + unsigned int l_reldepsmax; + + /* Nonzero if the DSO is used. */ + unsigned int l_used; /* Various flag words. */ ElfW(Word) l_feature_1; diff --git a/include/stdlib.h b/include/stdlib.h index f540bece9c..b4799d7d04 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -9,7 +9,9 @@ /* Now define the internal interfaces. */ #ifndef __Need_M_And_C -# include <sys/stat.h> +# ifndef _ISOMAC +# include <sys/stat.h> +# endif __BEGIN_DECLS @@ -78,8 +80,10 @@ extern int __clearenv (void); extern char *__canonicalize_file_name (__const char *__name); extern char *__realpath (__const char *__name, char *__resolved); extern int __ptsname_r (int __fd, char *__buf, size_t __buflen); +# ifndef _ISOMAC extern int __ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp); +# endif extern int __getpt (void); extern int __posix_openpt (int __oflag); |