diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/elf.h | 11 | ||||
| -rw-r--r-- | include/resolv.h | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/include/elf.h b/include/elf.h index ebb27a7ec..16a697271 100644 --- a/include/elf.h +++ b/include/elf.h @@ -20,9 +20,10 @@ #ifndef _ELF_H #define _ELF_H 1 -#include <features.h> - -__BEGIN_DECLS +/* Avoid features.h here for portability. This stuff matches sys/cdefs.h. */ +#ifdef __cplusplus +extern "C" { +#endif /* Standard ELF types. */ @@ -3062,6 +3063,8 @@ typedef Elf32_Addr Elf32_Conflict; /* Keep this the last entry. */ #define R_XTENSA_NUM 50 -__END_DECLS +#ifdef __cplusplus +} +#endif #endif /* elf.h */ diff --git a/include/resolv.h b/include/resolv.h index 184ef30c4..dd3b30074 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -279,10 +279,14 @@ struct res_sym { /* 0x00008000 */ /* Things involving an internal (static) resolver context. */ +#if 0 __BEGIN_DECLS extern struct __res_state *__res_state(void) __attribute__ ((__const__)); __END_DECLS #define _res (*__res_state()) +#else +extern struct __res_state _res; +#endif #define fp_nquery __fp_nquery #define fp_query __fp_query @@ -421,6 +425,11 @@ int res_nsend (res_state, const u_char *, int, u_char *, int) __THROW; void res_nclose (res_state) __THROW; __END_DECLS + +/* + * Current resolv.c is not TLS aware so disable this for now + */ +#if 0 # if _LIBC # ifdef __UCLIBC_HAS_THREADS__ # if defined __UCLIBC_HAS_TLS__ \ @@ -438,4 +447,6 @@ extern __thread struct __res_state *__resp attribute_tls_model_ie; # endif /* __UCLIBC_HAS_TLS__ */ # endif /* __UCLIBC_HAS_THREADS__ */ # endif /* _LIBC */ +#endif + #endif /* !_RESOLV_H_ */ |