From cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 25 Feb 2006 04:03:33 +0000 Subject: Merge from trunk. Going pretty good so far. Kind of. Okay, not really. --- libc/misc/time/ftime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/misc/time/ftime.c') diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c index 904763241..233d6f70d 100644 --- a/libc/misc/time/ftime.c +++ b/libc/misc/time/ftime.c @@ -16,11 +16,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define gettimeofday __gettimeofday - #include #include +libc_hidden_proto(gettimeofday) + int ftime(timebuf) struct timeb *timebuf; { -- cgit v1.2.3