Added #ifdef around ``extern int ftime();'' for MS WINDOWS (which has

a conflicting definition somewhere).
Resolved line wrap for error message in ins().

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 754818a2bf554c6e69263a48ad6c3fdbe964bb8a..77b170d78a579807fd803c5d679a337462606871 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -59,8 +59,10 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef HAVE_FTIME
 #include <sys/timeb.h>
+#ifndef MS_WINDOWS
 extern int ftime();
-#endif
+#endif /* MS_WINDOWS */
+#endif /* HAVE_FTIME */
 
 #ifdef __WATCOMC__
 #include <i86.h>
@@ -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);
 }