diff options
| author | Guido van Rossum <guido@python.org> | 1996-12-09 18:38:52 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1996-12-09 18:38:52 (GMT) |
| commit | 52174577eb66cb5e54b3230a16e99dd5b76b6c23 (patch) | |
| tree | f9ab34871a09f6d56c9760902d3c69c1025b4a76 /Modules | |
| parent | f52560197f39128d21cc552c08c224af0f8035f0 (diff) | |
| download | cpython-52174577eb66cb5e54b3230a16e99dd5b76b6c23.zip cpython-52174577eb66cb5e54b3230a16e99dd5b76b6c23.tar.gz cpython-52174577eb66cb5e54b3230a16e99dd5b76b6c23.tar.bz2 | |
Added #ifdef around ``extern int ftime();'' for MS WINDOWS (which has
a conflicting definition somewhere).
Resolved line wrap for error message in ins().
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/timemodule.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 754818a..77b170d 100644 --- 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); } |