diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-02-01 12:28:54 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-02-01 12:28:54 -0800 |
| commit | 9e22545a13d62299c59b048ae5923bf6da14ff9f (patch) | |
| tree | 2aab233cda445781073c1f7f9dec154b867aa139 /libc/inet | |
| parent | e999106d1b95e63283e9bb8246e5c34e9c1e85f7 (diff) | |
| parent | 22de495da40d7649eb28fdfc70ce1d5f3b6572ea (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/stdlib/Makefile.in
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc/inet')
| -rw-r--r-- | libc/inet/resolv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 4087f8db8..ee1323e76 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -3018,7 +3018,7 @@ __thread struct __res_state *__resp = &_res; * relocations. */ extern __thread struct __res_state *__libc_resp - __attribute__ ((alias ("__resp"))); + __attribute__ ((alias ("__resp"))) attribute_hidden; # else # undef __resp struct __res_state *__resp = &_res; |