diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
| commit | 32e5e786daa69be1f153f01cd428ac18634bb7bc (patch) | |
| tree | ea6947f2380e156ea6ba91f5fa17a67a46304947 /include | |
| parent | b44389edf1a88c6607a6c365bd8d884aee2edead (diff) | |
| parent | 2e7c805d5ec1f0d2f46354bca65b1feffa7af63b (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/link.h | 6 | ||||
| -rw-r--r-- | include/unistd.h | 3 | ||||
| -rw-r--r-- | include/wchar.h | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/link.h b/include/link.h index 26c67438f0..9d1fc1a8fe 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, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2007, 2009, 2010 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 @@ -188,6 +188,10 @@ struct link_map unsigned int l_contiguous:1; /* Nonzero if inter-segment holes are mprotected or if no holes are present at all. */ + unsigned int l_symbolic_in_local_scope:1; /* Nonzero if l_local_scope + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ /* Collected information about own RPATH directories. */ struct r_search_path_struct l_rpath_dirs; diff --git a/include/unistd.h b/include/unistd.h index ccba893abe..0ad2983280 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -176,6 +176,9 @@ extern int __have_sock_cloexec; unless it is really necessary. */ #define __have_pipe2 __have_sock_cloexec +extern int __getlogin_r_loginuid (char *name, size_t namesize) + attribute_hidden; + __END_DECLS #endif diff --git a/include/wchar.h b/include/wchar.h index bca847731d..3afe0b6e2e 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -195,3 +195,8 @@ extern size_t __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, # endif #endif + +/* Undefine all __need_* constants in case we are included to get those + constants but the whole file was already read. */ +#undef __need_mbstate_t +#undef __need_wint_t |