diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-04-06 15:13:59 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-04-06 15:13:59 +0200 |
| commit | 3b3285b1b7c02d36c74a6ae265fdb02ca991c96b (patch) | |
| tree | 0f3bf060794323ff690f6f4a86dc903c4570f540 /include/resolv.h | |
| parent | 289d19f45d7f8af9a4079938a3426aafdd2674ba (diff) | |
| parent | 85f4b028d767fc390a7b866d2f58d58be489242d (diff) | |
Merge remote-tracking branch 'origin/master' into prelink
* origin/master: (137 commits)
utils/ldd: Check for returned pointer from strrchr not the value it holds
cris: add provide arch-specific vfork implementation
lutimes.c, stubs.c: fix compiling lutimes, if __NR_utimensat is not defined
bump version to 0.9.32-rc3-git
release 0.9.32-rc3
memalign: include sys/param.h for MAX
arm/bits/atomic.h: Include common/bit/atomic.h for thumb1
wctype.h: fix libc_hidden_proto for iswupper and add it for iswspace
add libc_hidden_proto for wcs[n]casecmp_l
really fix missing __libc_drand48_data
Revert "missing prototype of __libc_drand48_data fixed"
missing prototype of __libc_drand48_data fixed
time.c, time.h: remove unused hidden strftime/strptime
nanosleep.c: remove duplicated libc_hidden_proto
ctype.c, ctype.h: remove commented parts that were banned for removal after 0.9.31
_wctype.c, wctype.h: remove unused isw* and wctype_l hidden functions
time.c, wchar.h: remove unused hidden wcsftime
str[n]casecmp.c: fix hidden usage
remove unused hidden functions
frv/memset.S: add missing libc_hidden_def
...
Conflicts:
ldso/ldso/ldso.c
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'include/resolv.h')
| -rw-r--r-- | include/resolv.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/resolv.h b/include/resolv.h index b9ce1e2a2..cba26f004 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -282,46 +282,61 @@ extern struct __res_state *__res_state(void) __attribute__ ((__const__)); __END_DECLS #define _res (*__res_state()) +#if 0 #define fp_nquery __fp_nquery #define fp_query __fp_query #define hostalias __hostalias #define p_query __p_query +#endif #define res_close __res_close #define res_init __res_init +#if 0 #define res_isourserver __res_isourserver #define res_mkquery __res_mkquery +#endif #define res_query __res_query #define res_querydomain __res_querydomain #define res_search __res_search +#if 0 #define res_send __res_send +#endif __BEGIN_DECLS +#if 0 void fp_nquery (const u_char *, int, FILE *) __THROW; void fp_query (const u_char *, FILE *) __THROW; const char * hostalias (const char *) __THROW; void p_query (const u_char *) __THROW; +#endif #ifdef __UCLIBC_HAS_BSD_RES_CLOSE__ void res_close (void) __THROW; #endif int res_init (void) __THROW; libc_hidden_proto(res_init) +#if 0 int res_isourserver (const struct sockaddr_in *) __THROW; int res_mkquery (int, const char *, int, int, const u_char *, int, const u_char *, u_char *, int) __THROW; +#endif int res_query (const char *, int, int, u_char *, int) __THROW; libc_hidden_proto(res_query) int res_querydomain (const char *, const char *, int, int, u_char *, int) __THROW; libc_hidden_proto(res_querydomain) int res_search (const char *, int, int, u_char *, int) __THROW; +#if 0 int res_send (const u_char *, int, u_char *, int) __THROW; +#endif __END_DECLS +#if 0 #define b64_ntop __b64_ntop #define b64_pton __b64_pton #define dn_comp __dn_comp #define dn_count_labels __dn_count_labels +#endif #define dn_expand __dn_expand +#if 0 #define dn_skipname __dn_skipname #define fp_resstat __fp_resstat #define loc_aton __loc_aton @@ -359,7 +374,9 @@ __END_DECLS #define sym_ntop __sym_ntop #define sym_ntos __sym_ntos #define sym_ston __sym_ston +#endif __BEGIN_DECLS +#if 0 int res_hnok (const char *) __THROW; int res_ownok (const char *) __THROW; int res_mailok (const char *) __THROW; @@ -389,8 +406,10 @@ char * p_secstodate (u_long) __THROW; int dn_count_labels (const char *) __THROW; int dn_comp (const char *, u_char *, int, u_char **, u_char **) __THROW; +#endif int dn_expand (const u_char *, const u_char *, const u_char *, char *, int) __THROW; +#if 0 u_int res_randomid (void) __THROW; int res_nameinquery (const char *, int, int, const u_char *, const u_char *) __THROW; @@ -418,6 +437,7 @@ int res_nmkquery (res_state, int, const char *, int, int, int res_nsend (res_state, const u_char *, int, u_char *, int) __THROW; void res_nclose (res_state) __THROW; +#endif __END_DECLS # if _LIBC |