svn commit: trunk/uClibc/libc/misc/internals

vapier at uclibc.org vapier at uclibc.org
Wed Feb 21 08:16:29 UTC 2007


Author: vapier
Date: 2007-02-21 00:16:28 -0800 (Wed, 21 Feb 2007)
New Revision: 17941

Log:
redo errno handling so that it should work both in thread and non-threaded situations

Modified:
   trunk/uClibc/libc/misc/internals/__errno_location.c
   trunk/uClibc/libc/misc/internals/__h_errno_location.c
   trunk/uClibc/libc/misc/internals/errno.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__errno_location.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__errno_location.c	2007-02-21 07:58:16 UTC (rev 17940)
+++ trunk/uClibc/libc/misc/internals/__errno_location.c	2007-02-21 08:16:28 UTC (rev 17941)
@@ -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)

Modified: trunk/uClibc/libc/misc/internals/__h_errno_location.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__h_errno_location.c	2007-02-21 07:58:16 UTC (rev 17940)
+++ trunk/uClibc/libc/misc/internals/__h_errno_location.c	2007-02-21 08:16:28 UTC (rev 17941)
@@ -4,14 +4,8 @@
  * 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;
+#include "internal_errno.h"
 
-libc_hidden_proto(h_errno)
-
 libc_hidden_proto(__h_errno_location)
 int * weak_const_function __h_errno_location (void)
 {

Modified: trunk/uClibc/libc/misc/internals/errno.c
===================================================================
--- trunk/uClibc/libc/misc/internals/errno.c	2007-02-21 07:58:16 UTC (rev 17940)
+++ trunk/uClibc/libc/misc/internals/errno.c	2007-02-21 08:16:28 UTC (rev 17941)
@@ -1,22 +1,15 @@
-#include <features.h>
-#undef errno
+#include "internal_errno.h"
 
-extern int errno;
-extern int h_errno;
-
+#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




More information about the uClibc-cvs mailing list