From f8f7b102217864ea382a46bb9ad173b3493e5cae Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Sun, 31 Oct 2004 20:23:09 +0000
Subject: Revert Peter's __lib_gettimeofday patch.  There's the minor issue of
 adding cruft to include/sys/time.h.  But also, there's no sense in making
 changes like this until we decide how we're going to approach the hidden
 symbol transition.

---
 libc/misc/time/clock_gettime.c | 2 +-
 libc/misc/time/ftime.c         | 2 +-
 libc/misc/time/time.c          | 2 +-
 libc/misc/utmp/wtent.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libc/misc')

diff --git a/libc/misc/time/clock_gettime.c b/libc/misc/time/clock_gettime.c
index b71a8ac2d..550cf4dc4 100644
--- a/libc/misc/time/clock_gettime.c
+++ b/libc/misc/time/clock_gettime.c
@@ -26,7 +26,7 @@ int clock_gettime (clockid_t clock, struct timespec* ts)
 	int retval = -1;
 	switch (clock) {
 		case CLOCK_REALTIME:
-			retval = __libc_gettimeofday (&tv, NULL);
+			retval = gettimeofday (&tv, NULL);
 			if (retval == 0) {
 				TIMEVAL_TO_TIMESPEC (&tv, ts);
 			}
diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c
index cd7d7f9e2..24789c9eb 100644
--- a/libc/misc/time/ftime.c
+++ b/libc/misc/time/ftime.c
@@ -25,7 +25,7 @@ struct timeb *timebuf;
 	struct timeval tv;
 	struct timezone tz;
 
-	if (__libc_gettimeofday (&tv, &tz) < 0)
+	if (gettimeofday (&tv, &tz) < 0)
 		return -1;
 
 	timebuf->time = tv.tv_sec;
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index dbd72b064..ac2fe5926 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -1603,7 +1603,7 @@ time_t time(register time_t *tloc)
 	struct timeval tv;
 	register struct timeval *p = &tv;
 
-	__libc_gettimeofday(p, NULL);		/* This should never fail... */
+	gettimeofday(p, NULL);		/* This should never fail... */
 
 	if (tloc) {
 		*tloc = p->tv_sec;
diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c
index 9556ff338..ef5663feb 100644
--- a/libc/misc/utmp/wtent.c
+++ b/libc/misc/utmp/wtent.c
@@ -38,7 +38,7 @@ void logwtmp (const char *line, const char *name, const char *host)
     strncpy(lutmp.ut_line, line, sizeof(lutmp.ut_line)-1);
     strncpy(lutmp.ut_name, name, sizeof(lutmp.ut_name)-1);
     strncpy(lutmp.ut_host, host, sizeof(lutmp.ut_host)-1);
-    __libc_gettimeofday(&(lutmp.ut_tv), NULL);
+    gettimeofday(&(lutmp.ut_tv), NULL);
 
     updwtmp(_PATH_WTMP, &(lutmp));
 }
-- 
cgit v1.2.3