diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-09-05 22:41:05 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-09-05 22:41:05 +0000 |
commit | 2c1d357a5fe5bdc4c9521a9d1af05ba1b5a4c238 (patch) | |
tree | 12e23fa555f1432064e8fdeeb063dce798764f50 /libc/include | |
parent | 0d983ceeeee6bd20ae296d224ca2fd4bf27a47af (diff) |
Merge changes between r23795 and r23927 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23928 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/include')
-rw-r--r-- | libc/include/complex.h | 2 | ||||
-rw-r--r-- | libc/include/fenv.h | 4 | ||||
-rw-r--r-- | libc/include/libc-symbols.h | 4 | ||||
-rw-r--r-- | libc/include/netdb.h | 15 | ||||
-rw-r--r-- | libc/include/resolv.h | 18 | ||||
-rw-r--r-- | libc/include/shlib-compat.h | 8 |
6 files changed, 18 insertions, 33 deletions
diff --git a/libc/include/complex.h b/libc/include/complex.h index e173f1f6a..082e71fb1 100644 --- a/libc/include/complex.h +++ b/libc/include/complex.h @@ -1,11 +1,13 @@ #ifndef _COMPLEX_H # include <math/complex.h> +# ifndef _ISOMAC /* Return the complex inverse hyperbolic sine of finite nonzero Z, with the imaginary part of the result subtracted from pi/2 if ADJ is nonzero. */ extern complex float __kernel_casinhf (complex float z, int adj); extern complex double __kernel_casinh (complex double z, int adj); extern complex long double __kernel_casinhl (complex long double z, int adj); +# endif #endif diff --git a/libc/include/fenv.h b/libc/include/fenv.h index 9f90d1709..925d4b50c 100644 --- a/libc/include/fenv.h +++ b/libc/include/fenv.h @@ -1,8 +1,8 @@ #ifndef _FENV_H #include <math/fenv.h> -#include <stdbool.h> #ifndef _ISOMAC +# include <stdbool.h> /* Now define the internal interfaces. */ extern int __feclearexcept (int __excepts); @@ -22,7 +22,6 @@ libm_hidden_proto (feholdexcept) libm_hidden_proto (feupdateenv) libm_hidden_proto (fetestexcept) libm_hidden_proto (feclearexcept) -#endif /* Rounding mode context. This allows functions to set/restore rounding mode only when the desired rounding mode is different from the current rounding @@ -32,5 +31,6 @@ struct rm_ctx fenv_t env; bool updated_status; }; +#endif #endif diff --git a/libc/include/libc-symbols.h b/libc/include/libc-symbols.h index a3b6274ba..5f603a286 100644 --- a/libc/include/libc-symbols.h +++ b/libc/include/libc-symbols.h @@ -322,7 +322,7 @@ for linking") past the last element in SET. */ #define symbol_set_end_p(set, ptr) ((ptr) >= (void *const *) &__stop_##set) -#if DO_VERSIONING +#ifdef SHARED # define symbol_version(real, name, version) \ _symbol_version(real, name, version) # define default_symbol_version(real, name, version) \ @@ -466,7 +466,7 @@ for linking") versioned_symbol (libc, __real_foo, foo, GLIBC_2_1); libc_hidden_ver (__real_foo, foo) */ -#if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN +#if defined SHARED && !defined NO_HIDDEN # ifndef __ASSEMBLER__ # define __hidden_proto_hiddenattr(attrs...) \ __attribute__ ((visibility ("hidden"), ##attrs)) diff --git a/libc/include/netdb.h b/libc/include/netdb.h index cbf2645ac..1019e6f54 100644 --- a/libc/include/netdb.h +++ b/libc/include/netdb.h @@ -6,17 +6,12 @@ /* Macros for accessing h_errno from inside libc. */ # if !defined NOT_IN_libc || defined IN_LIB # undef h_errno -# ifdef _LIBC_REENTRANT -# include <tls.h> -# ifndef NOT_IN_libc -# define h_errno __libc_h_errno -# else -# define h_errno h_errno /* For #ifndef h_errno tests. */ -# endif -extern __thread int h_errno attribute_tls_model_ie; +# ifndef NOT_IN_libc +# define h_errno __libc_h_errno # else -extern int h_errno; -# endif /* _LIBC_REENTRANT */ +# define h_errno h_errno /* For #ifndef h_errno tests. */ +# endif +extern __thread int h_errno attribute_tls_model_ie; # endif /* !NOT_IN_libc || IN_LIB */ # define __set_h_errno(x) (h_errno = (x)) diff --git a/libc/include/resolv.h b/libc/include/resolv.h index 30ea8776b..87b359833 100644 --- a/libc/include/resolv.h +++ b/libc/include/resolv.h @@ -13,20 +13,12 @@ #ifdef _RESOLV_H_ -# ifdef _LIBC_REENTRANT -# include <tls.h> -# undef _res -# ifndef NOT_IN_libc -# define __resp __libc_resp -# endif -# define _res (*__resp) -extern __thread struct __res_state *__resp attribute_tls_model_ie; -# else -# ifndef __BIND_NOSTATIC -# undef _res -extern struct __res_state _res; -# endif +# ifndef NOT_IN_libc +# define __resp __libc_resp # endif +extern __thread struct __res_state *__resp attribute_tls_model_ie; +# undef _res +# define _res (*__resp) /* Now define the internal interfaces. */ extern int __res_vinit (res_state, int); diff --git a/libc/include/shlib-compat.h b/libc/include/shlib-compat.h index 979b5929e..955c6aeea 100644 --- a/libc/include/shlib-compat.h +++ b/libc/include/shlib-compat.h @@ -19,13 +19,9 @@ #ifndef _SHLIB_COMPAT_H #define _SHLIB_COMPAT_H 1 -#if defined DO_VERSIONING -/* Since there is just one set of .d files generated, we need to - include this unconditionally to have the dependency noticed properly. */ -#include <abi-versions.h> /* header generated by abi-versions.awk */ -#endif +#ifdef SHARED -#if defined SHARED && defined DO_VERSIONING +# include <abi-versions.h> /* The file abi-versions.h (generated by scripts/abi-versions.awk) defines symbols like `ABI_libm_GLIBC_2_0' for each version set in the source |