diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
| commit | d063d164335938d557460bebaa7cfe388157b627 (patch) | |
| tree | 92ef3f54771c0a28190b76ee45f90d16fd39714f /inet | |
| parent | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff) | |
| download | glibc-d063d164335938d557460bebaa7cfe388157b627.tar glibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz glibc-d063d164335938d557460bebaa7cfe388157b627.tar.bz2 glibc-d063d164335938d557460bebaa7cfe388157b627.zip | |
Remove support for !USE___THREAD
Diffstat (limited to 'inet')
| -rw-r--r-- | inet/herrno-loc.c | 6 | ||||
| -rw-r--r-- | inet/herrno.c | 20 |
2 files changed, 3 insertions, 23 deletions
diff --git a/inet/herrno-loc.c b/inet/herrno-loc.c index fd6deeb330..1c2002bee4 100644 --- a/inet/herrno-loc.c +++ b/inet/herrno-loc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 97, 98, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996, 97, 98, 2002, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,10 +19,6 @@ #include <netdb.h> #include <tls.h> -#if ! USE___THREAD -# undef h_errno -extern int h_errno; -#endif /* When threaded, h_errno may be a per-thread variable. */ int * diff --git a/inet/herrno.c b/inet/herrno.c index 9ff30a191b..59706cdc05 100644 --- a/inet/herrno.c +++ b/inet/herrno.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,97,98,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,98,2002,2003,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,23 +25,7 @@ /* We need to have the error status variable of the resolver accessible in the libc. */ -#if USE___THREAD __thread int h_errno; extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden; -# define h_errno __libc_h_errno -#else -/* This differs from plain `int h_errno;' in that it doesn't create - a common definition, but a plain symbol that resides in .bss, - which can have an alias. */ -int h_errno __attribute__((section (".bss"))); -weak_alias (h_errno, _h_errno) - -/* We declare these with compat_symbol so that they are not - visible at link time. Programs must use the accessor functions. */ -# if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING -# include <shlib-compat.h> -compat_symbol (libc, h_errno, h_errno, GLIBC_2_0); -compat_symbol (libc, _h_errno, _h_errno, GLIBC_2_0); -# endif -#endif +#define h_errno __libc_h_errno |