Import Upstream version 5d6upstream/5d6

1 files changed, 30 insertions, 11 deletions

diff --git a/time.c b/time.c
index 9d3be9a..7cefb94 100644
--- a/time.c
+++ b/time.c
@@ -15,26 +15,26 @@
  * the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
+ * for additional uses of the text contained in its release of SCM.
  *
- * The exception is that, if you link the GUILE library with other files
+ * The exception is that, if you link the SCM library with other files
  * to produce an executable, this does not by itself cause the
  * resulting executable to be covered by the GNU General Public License.
  * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * linking the SCM library code into it.
  *
  * This exception does not however invalidate any other reasons why
  * the executable file might be covered by the GNU General Public License.
  *
  * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
+ * Free Software Foundation under the name SCM.  If you copy
  * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
+ * SCM, as the General Public License permits, the exception does
  * not apply to the code that you add in this way.  To avoid misleading
  * anyone as to the status of such modified files, you must delete
  * this exception notice from them.
  *
- * If you write modifications of your own for GUILE, it is your choice
+ * If you write modifications of your own for SCM, it is your choice
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
@@ -103,12 +103,26 @@
 # include <sys/timeb.h>
 # define USE_GETTIMEOFDAY
 #endif
+#ifdef __MACH__
+# define unix
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/timeb.h>
+# include <sys/times.h>
+# define USE_GETTIMEOFDAY
+#endif
 #ifdef __FreeBSD__
 # include <sys/types.h>
 # include <sys/time.h>
 # include <sys/timeb.h>
 # define USE_GETTIMEOFDAY
 #endif
+#ifdef __OpenBSD__
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/timeb.h>
+# define USE_GETTIMEOFDAY
+#endif
 #ifdef __TURBOC__
 # define LACK_TIMES
 #endif
@@ -130,9 +144,13 @@
 #ifdef SVR4
 # define LACK_FTIME
 #endif
-#ifdef __svr4__
+#ifdef __SVR4
 # define LACK_FTIME
 #endif
+#ifdef PLAN9
+#define LACK_FTIME
+#define LACK_TIMES
+#endif
 #ifdef nosve
 # define LACK_FTIME
 #endif
@@ -160,7 +178,7 @@
 #ifdef _UNICOS
 # define LACK_FTIME
 #endif
-#ifdef __amigados__
+#ifdef __amigaos__
 # include <sys/time.h>
 # include <sys/timeb.h>
 # include <sys/times.h>
@@ -168,7 +186,7 @@
 #endif
 
 #ifndef LACK_FTIME
-# ifdef unix
+# ifdef HAVE_UNIX
 #  ifndef GO32
 #   include <sys/timeb.h>
 #  endif
@@ -199,7 +217,7 @@
 #ifdef CLK_TCK
 # define CLKTCK CLK_TCK
 # ifdef CLOCKS_PER_SEC
-#  ifdef unix
+#  ifdef HAVE_UNIX
 #   ifndef ARM_ULIB
 #    include <sys/times.h>
 #   endif
@@ -335,7 +353,8 @@ SCM your_time()
   else if ((1 + time_buffer1.time)==time_buffer2.time) ;
   else if (cnt < TIMETRIES) goto tryagain;
   else {
-    scm_warn("could not read two ftime()s within one second in 10 tries",0L);
+    scm_warn("could not read two ftime()s within one second in 10 tries",
+	     "", UNDEFINED);
     return MAKINUM(-1);
   }
   tmp = CLKTCK*(time_buffer2.millitm - your_base.millitm);