summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1994-01-14 16:55:50 (GMT)
committerGuido van Rossum <guido@python.org>1994-01-14 16:55:50 (GMT)
commitcbcd8d796f36f9eedc25690229eca0b4fa55ee68 (patch)
treea8f943f6991aa35585168aee4858bdcb0f75cc7e /Modules
parent4de6cbccf0e34f82c53578ba1319d2647a843307 (diff)
downloadcpython-cbcd8d796f36f9eedc25690229eca0b4fa55ee68.zip
cpython-cbcd8d796f36f9eedc25690229eca0b4fa55ee68.tar.gz
cpython-cbcd8d796f36f9eedc25690229eca0b4fa55ee68.tar.bz2
Make more robust against Minix and Mac
Diffstat (limited to 'Modules')
-rw-r--r--Modules/timing.h16
-rw-r--r--Modules/timingmodule.c11
2 files changed, 22 insertions, 5 deletions
diff --git a/Modules/timing.h b/Modules/timing.h
index aef6457..4495631 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 fcfa8f7..f15b3fd 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"