From 52174577eb66cb5e54b3230a16e99dd5b76b6c23 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 9 Dec 1996 18:38:52 +0000 Subject: [PATCH] Added #ifdef around ``extern int ftime();'' for MS WINDOWS (which has a conflicting definition somewhere). Resolved line wrap for error message in ins(). --- Modules/timemodule.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 754818a2bf5..77b170d78a5 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -59,8 +59,10 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_FTIME #include +#ifndef MS_WINDOWS extern int ftime(); -#endif +#endif /* MS_WINDOWS */ +#endif /* HAVE_FTIME */ #ifdef __WATCOMC__ #include @@ -335,7 +337,7 @@ ins(d, name, v) Py_FatalError("Can't initialize time module -- NULL value"); if (PyDict_SetItemString(d, name, v) != 0) Py_FatalError( - "Can't initialize time module -- PyDict_SetItemString failed"); + "Can't initialize time module -- PyDict_SetItemString failed"); Py_DECREF(v); }