summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2007-03-08 01:26:49 +0000
committerRob Landley <rob@landley.net>2007-03-08 01:26:49 +0000
commit78a11bc1915300ec68917ab9bf6e0dc1cb84a317 (patch)
tree11ccb40aadac50708f3a5ccc20512e8d840cf673
parent5a551453e6886968a089b63f4ccffd21059e2336 (diff)
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.
-rw-r--r--libc/misc/internals/internal_errno.h13
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_errno.h5
2 files changed, 4 insertions, 14 deletions
diff --git a/libc/misc/internals/internal_errno.h b/libc/misc/internals/internal_errno.h
index d05537cdf..a93d0bf02 100644
--- 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 c7de8b56e..b16de32aa 100644
--- 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