summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-09-07 00:47:35 (GMT)
committerGuido van Rossum <guido@python.org>1996-09-07 00:47:35 (GMT)
commitb2fb36498ded10362c65712a816f120e31d30126 (patch)
tree7453458f1393850a531a8c0b213b467569d6dbc0 /Modules
parentc8adefef7036b73761dbf732ec76e8b93bd58077 (diff)
downloadcpython-b2fb36498ded10362c65712a816f120e31d30126.zip
cpython-b2fb36498ded10362c65712a816f120e31d30126.tar.gz
cpython-b2fb36498ded10362c65712a816f120e31d30126.tar.bz2
Sleep() turns out to be win32 specific.
The timezone etc. overrides are win16 specific. Hope I got this right now...
Diffstat (limited to 'Modules')
-rw-r--r--Modules/timemodule.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index ae68508..aee599a 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -61,14 +61,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else
#ifdef MS_WINDOWS
#include <windows.h>
+#ifdef MS_WIN16
+/* These overrides not needed for Win32 */
#define timezone _timezone
-#ifndef tzname
#define tzname _tzname
-#endif
-#ifndef daylight
#define daylight _daylight
-#endif
#define altzone _altzone
+#endif /* MS_WIN16 */
#endif /* MS_WINDOWS */
#endif /* !__WATCOMC__ */
@@ -473,13 +472,13 @@ floatsleep(secs)
break;
}
#else /* !MSDOS */
-#ifdef MS_WINDOWS
+#ifdef MS_WIN32
/* XXX Can't interrupt this sleep */
Sleep((int)(secs*1000));
-#else /* !MS_WINDOWS */
+#else /* !MS_WIN32 */
/* XXX Can't interrupt this sleep */
sleep((int)secs);
-#endif /* !MS_WINDOWS */
+#endif /* !MS_WIN32 */
#endif /* !MSDOS */
#endif /* !__WATCOMC__ */
#endif /* !macintosh */