summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-06-15 19:27:00 +0000
committerEric Andersen <andersen@codepoet.org>2002-06-15 19:27:00 +0000
commitf77a22a2223653a1d028bbd8fa5314fac7e7d7af (patch)
tree9092545321c35d529cc239efdbf04433fdb1940a
parente01d0733f5fc7afcd609f9eee4071705610a1db5 (diff)
time() is implemented in syscalls.c
-Erik
-rw-r--r--libc/misc/time/Makefile2
-rw-r--r--libc/misc/time/time.c38
2 files changed, 1 insertions, 39 deletions
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 62fafd75f..3e0845799 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)Rules.mak
CSRC=localtime.c gmtime.c asctime.c ctime.c asc_conv.c tm_conv.c mktime.c \
localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c \
- clock.c difftime.c time.c ftime.c strftime.c strptime.c __time_locale.c \
+ clock.c difftime.c ftime.c strftime.c strptime.c __time_locale.c \
__time_static.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
deleted file mode 100644
index e96ae1cb9..000000000
--- a/libc/misc/time/time.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <time.h>
-#include <sys/time.h>
-
-
-/* Return the current time as a `time_t' and also put it in *T if T is
- not NULL. Time is represented as seconds from Jan 1 00:00:00 1970. */
-time_t time (time_t *t)
-{
- struct timeval tv;
- time_t result;
-
- if (gettimeofday (&tv, (struct timezone *) NULL))
- result = (time_t) -1;
- else
- result = (time_t) tv.tv_sec;
-
- if (t != NULL)
- *t = result;
- return result;
-}