diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-02-21 08:16:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-21 08:16:28 +0000 |
| commit | 8da931c772fa71da7e4d638fe310533b8e124ca3 (patch) | |
| tree | 0de4b4f25e999e72d989bf031abbd3e87023ee05 | |
| parent | 4fd21f190d732d724efd2cb59a0ced85bad80978 (diff) | |
redo errno handling so that it should work both in thread and non-threaded situations
| -rw-r--r-- | libc/misc/internals/__errno_location.c | 5 | ||||
| -rw-r--r-- | libc/misc/internals/__h_errno_location.c | 8 | ||||
| -rw-r--r-- | libc/misc/internals/errno.c | 23 |
3 files changed, 10 insertions, 26 deletions
diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c index 5a2af36fd..a44bf6062 100644 --- a/libc/misc/internals/__errno_location.c +++ b/libc/misc/internals/__errno_location.c @@ -4,10 +4,7 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#include <errno.h> -#undef errno -extern int errno; -libc_hidden_proto(errno) +#include "internal_errno.h" /* psm: moved to bits/errno.h: libc_hidden_proto(__errno_location) */ libc_hidden_proto(__errno_location) diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c index 10b7673e3..2ac21774c 100644 --- a/libc/misc/internals/__h_errno_location.c +++ b/libc/misc/internals/__h_errno_location.c @@ -4,13 +4,7 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define __FORCE_GLIBC -#include <features.h> -#include <netdb.h> -#undef h_errno -extern int h_errno; - -libc_hidden_proto(h_errno) +#include "internal_errno.h" libc_hidden_proto(__h_errno_location) int * weak_const_function __h_errno_location (void) diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index e06b3d228..fd9bf170c 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -1,22 +1,15 @@ -#include <features.h> -#undef errno - -extern int errno; -extern int h_errno; +#include "internal_errno.h" +#ifdef __UCLIBC_HAS_THREADS__ libc_hidden_proto(errno) libc_hidden_proto(h_errno) - -#if 0 -/* Unfortunately, this doesn't work... */ -int h_errno __attribute__ ((section (".bss"))) = 0; -int errno __attribute__ ((section (".bss"))) = 0; -#else -int _errno = 0; -int _h_errno = 0; #endif +int errno = 0; +int h_errno = 0; -weak_alias(_errno,errno) +#ifdef __UCLIBC_HAS_THREADS__ +//weak_alias(_errno, errno) libc_hidden_def(errno) -weak_alias(_h_errno,h_errno) +//weak_alias(_h_errno, h_errno) libc_hidden_def(h_errno) +#endif |