Import Debian changes 5b3-1debian/5b3-1

scm (5b3-1) unstable; urgency=low

  * New maintainer
  * New version
  * libc6

1 files changed, 20 insertions, 1 deletions

diff --git a/time.c b/time.c
index 871082f..4b4368c 100644
--- a/time.c
+++ b/time.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,6 +79,10 @@
 #   ifndef GO32
 #    include <sys/timeb.h>
 #   endif
+#  else
+#   ifdef __amigados__
+#    include <sys/timeb.h>
+#   endif
 #  endif
 # endif
 
@@ -387,3 +391,18 @@ void init_time()
 	if (!my_base) my_base = mytime();
 	init_iprocs(subr0s, tc7_subr_0);
 }
+#ifdef freebsd
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/timeb.h>
+int ftime(time_buffer)
+     struct timeb *time_buffer;
+{
+  struct timezone t_z; struct timeval t_v;
+  if (gettimeofday(&t_v, &t_z) < 0) return -1;
+  time_buffer->timezone = t_z.tz_minuteswest;
+  time_buffer->dstflag = t_z.tz_dsttime;
+  time_buffer->millitm = t_v.tv_usec / 1000;
+  time_buffer->time = t_v.tv_sec;
+  return 0;}
+#endif