svn 17941/17943 broke the build. 18032 made the threaded case compile

again, this makes the non-threaded case compile again.  I have no idea
if this is the proper fix, I'm just tired if it not compiling for two
weeks.

diff --git a/libc/misc/internals/internal_errno.h b/libc/misc/internals/internal_errno.h
index d05537c..a93d0bf 100644 (file)
--- a/libc/misc/internals/internal_errno.h
+++ b/libc/misc/internals/internal_errno.h
@@ -9,15 +9,10 @@
 #undef errno
 #undef h_errno
 
-/* need to tweak libpthread
-#ifdef __UCLIBC_HAS_THREADS__
-# define errno __uclibc_errno
-# define h_errno __uclibc_h_errno
-#endif
-*/
-
 extern int h_errno;
-libc_hidden_proto(h_errno)
-
 extern int errno;
+
+#ifdef __UCLIBC_HAS_THREADS__
+libc_hidden_proto(h_errno)
 libc_hidden_proto(errno)
+#endif

diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
index c7de8b5..b16de32 100644 (file)
--- a/libc/sysdeps/linux/common/bits/uClibc_errno.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_errno.h
@@ -38,11 +38,6 @@ libc_hidden_proto(__errno_location)
 #  endif
 # endif
 
-/* We now need a declaration of the `errno' variable.  */
-# ifndef __UCLIBC_HAS_THREADS__
-/*extern int errno;*/
-libc_hidden_proto(errno)
-# endif
 #endif /* !__ASSEMBLER__ */
 
 #endif