From: Guido van Rossum <guido@python.org>
Date: Fri, 14 Jan 1994 16:55:50 +0000 (+0000)
Subject: Make more robust against Minix and Mac
X-Git-Tag: v1.0.1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbcd8d796f36f9eedc25690229eca0b4fa55ee68;p=thirdparty%2FPython%2Fcpython.git

Make more robust against Minix and Mac
---

diff --git a/Modules/timing.h b/Modules/timing.h
index aef6457c8c6c..4495631f962a 100644
--- a/Modules/timing.h
+++ b/Modules/timing.h
@@ -37,9 +37,12 @@
  * Author: George V. Neville-Neil
  *
  * Update History: $Log$
- * Update History: Revision 2.1  1994/01/02 23:22:19  guido
- * Update History: Added George Neville-Neil's timing module
+ * Update History: Revision 2.2  1994/01/14 16:55:47  guido
+ * Update History: Make more robust against Minix and Mac
  * Update History:
+ * Revision 2.1  1994/01/02  23:22:19  guido
+ * Added George Neville-Neil's timing module
+ *
  * Revision 1.1  93/12/28  13:14:19  gnn
  * Initial revision
  * 
@@ -62,7 +65,16 @@
 #ifndef _TIMING_H_
 #define _TIMING_H_
 
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else /* !TIME_WITH_SYS_TIME */
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#else /* !HAVE_SYS_TIME_H */
+#include <time.h>
+#endif /* !HAVE_SYS_TIME_H */
+#endif /* !TIME_WITH_SYS_TIME */
 
 static struct timeval aftertp, beforetp;
 
diff --git a/Modules/timingmodule.c b/Modules/timingmodule.c
index fcfa8f728496..f15b3fdb5ac6 100644
--- a/Modules/timingmodule.c
+++ b/Modules/timingmodule.c
@@ -5,9 +5,12 @@
  * Author: George V. Neville-Neil
  *
  * Update History: $Log$
- * Update History: Revision 2.1  1994/01/02 23:22:21  guido
- * Update History: Added George Neville-Neil's timing module
+ * Update History: Revision 2.2  1994/01/14 16:55:50  guido
+ * Update History: Make more robust against Minix and Mac
  * Update History:
+ * Revision 2.1  1994/01/02  23:22:21  guido
+ * Added George Neville-Neil's timing module
+ *
  * Revision 1.1  93/12/28  13:14:39  gnn
  * Initial revision
  * 
@@ -17,8 +20,10 @@
  */
 
 #ifndef lint
+#ifndef THINK_C
 static char rcsid [] = "$Header$" ;
-#endif
+#endif /* THINK_C */
+#endif /* lint */
 
 #include "allobjects.h"
 #include "import.h"