diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
| commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
| tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /resolv | |
| parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
| parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/netdb.h | 2 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 | ||||
| -rw-r--r-- | resolv/res_send.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/resolv/netdb.h b/resolv/netdb.h index 412343b42b..56729d179b 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -586,7 +586,7 @@ struct gaicb struct addrinfo *ar_result; /* Pointer to result. */ /* The following are internal elements. */ int __return; - int __unused[5]; + int __glibc_reserved[5]; }; /* Lookup mode. */ diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 0b37f46aea..ee3fa2114b 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -131,7 +131,7 @@ extern __thread struct __res_state *__libc_resp /* We declare this with compat_symbol so that it's not visible at link time. Programs must use the accessor functions. */ -#if defined SHARED && defined DO_VERSIONING +#ifdef SHARED # include <shlib-compat.h> compat_symbol (libc, _res, _res, GLIBC_2_0); #endif diff --git a/resolv/res_send.c b/resolv/res_send.c index 5a73696e55..7f2e85f324 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -441,7 +441,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, malloc(sizeof (struct sockaddr_in6)); if (EXT(statp).nsaddrs[n] != NULL) { memset (mempcpy(EXT(statp).nsaddrs[n], - &statp->nsaddr_list[n], + &statp->nsaddr_list[ns], sizeof (struct sockaddr_in)), '\0', sizeof (struct sockaddr_in6) |