فهرست منبع

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.

Rob Landley 19 سال پیش
والد
کامیت
78a11bc191
2فایلهای تغییر یافته به همراه4 افزوده شده و 14 حذف شده
  1. 4 9
      libc/misc/internals/internal_errno.h
  2. 0 5
      libc/sysdeps/linux/common/bits/uClibc_errno.h

+ 4 - 9
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

+ 0 - 5
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