From dc7f2e1bf0dc6ab6bec1d531026fb39271287711 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 11 Nov 2000 01:20:50 +0000
Subject: Fix up a few messes so it compiles cleanly again.

---
 include/time.h                   | 4 ----
 include/unistd.h                 | 5 +++++
 libc/inet/resolv.c               | 1 +
 libc/stdlib/mkstemp.c            | 1 +
 libc/stdlib/mktemp.c             | 1 +
 libc/stdlib/setenv.c             | 1 +
 libc/sysdeps/linux/common/tell.c | 1 +
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/time.h b/include/time.h
index 9bbcd8be0..12d7e6c61 100644
--- a/include/time.h
+++ b/include/time.h
@@ -108,15 +108,11 @@ extern time_t timelocal __P ((struct tm *__tp));
 
 #endif
 
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(_REENTRANT)
-
 extern char	* asctime_r	__P((__const struct tm *, char *));
 extern char	* ctime_r	__P((__const time_t *, char *));
 extern struct tm* gmtime_r	__P((__const time_t *, struct tm *));
 extern struct tm* localtime_r	__P((__const time_t *, struct tm *));
 
-#endif
-
 struct timespec;
 
 /* IEEE Std 1003.1b-1993. */
diff --git a/include/unistd.h b/include/unistd.h
index a9f9e4179..8da0ffe90 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -23,7 +23,10 @@
 #ifndef	_UNISTD_H
 #define	_UNISTD_H	1
 
+#include <errno.h>
 #include <features.h>
+#include <sys/types.h>
+#include <asm/unistd.h>
 
 __BEGIN_DECLS
 
@@ -173,6 +176,8 @@ __BEGIN_DECLS
    */
 
 #include <bits/posix_opt.h>
+/* At this time, we don't do pthreads... Sorry... */
+#undef _POSIX_THREADS
 
 /* Get the environment definitions from Unix98.  */
 #ifdef __USE_UNIX98
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 7b367ed4c..718d71a0d 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
+#include <errno.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/libc/stdlib/mkstemp.c b/libc/stdlib/mkstemp.c
index 738952815..551f03199 100644
--- a/libc/stdlib/mkstemp.c
+++ b/libc/stdlib/mkstemp.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <features.h>
+#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/libc/stdlib/mktemp.c b/libc/stdlib/mktemp.c
index cfdcf0913..4b9f71d47 100644
--- a/libc/stdlib/mktemp.c
+++ b/libc/stdlib/mktemp.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <features.h>
+#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index b17280562..6628e4cc7 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -19,6 +19,7 @@ Cambridge, MA 02139, USA.  */
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 #if !defined(HAVE_GNU_LD) && !defined (__ELF__)
 #define	__environ	environ
diff --git a/libc/sysdeps/linux/common/tell.c b/libc/sysdeps/linux/common/tell.c
index b58f3f944..dcae83206 100644
--- a/libc/sysdeps/linux/common/tell.c
+++ b/libc/sysdeps/linux/common/tell.c
@@ -1,4 +1,5 @@
 #define lseek __normal_lseek
+#include <errno.h>
 #include <unistd.h>
 #include <syscall.h>
 #undef lseek
-- 
cgit v1.2.3