diff options
| author | Thomas Wouters <thomas@python.org> | 2001-06-27 13:01:54 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2001-06-27 13:01:54 (GMT) |
| commit | 687f228681c4192d1b5a6cb568e50fa6cc995378 (patch) | |
| tree | eb4c4c925bcc300db295bdfe6e1b6c700f0e24cb | |
| parent | 94441fe0505ea4e37be84d8d50b57262e0db8739 (diff) | |
| download | cpython-687f228681c4192d1b5a6cb568e50fa6cc995378.zip cpython-687f228681c4192d1b5a6cb568e50fa6cc995378.tar.gz cpython-687f228681c4192d1b5a6cb568e50fa6cc995378.tar.bz2 | |
Backport of Tim's checkin 2.111:
SF patch #418147 Fixes to allow compiling w/ Borland, from Stephen Hansen.
| -rw-r--r-- | Modules/timemodule.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 0c5c257..0a54a93 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -41,17 +41,19 @@ extern int ftime(struct timeb *); #else #ifdef MS_WINDOWS #include <windows.h> -#ifdef MS_WIN16 +#if defined(MS_WIN16) || defined(__BORLANDC__) /* These overrides not needed for Win32 */ #define timezone _timezone #define tzname _tzname #define daylight _daylight +#endif /* MS_WIN16 || __BORLANDC__ */ +#ifdef MS_WIN16 #define altzone _altzone #endif /* MS_WIN16 */ #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ -#if defined(MS_WIN32) && !defined(MS_WIN64) +#if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__) /* Win32 has better clock replacement XXX Win64 does not yet, but might when the platform matures. */ #include <largeint.h> @@ -146,7 +148,7 @@ time_clock(PyObject *self, PyObject *args) } #endif /* HAVE_CLOCK */ -#if defined(MS_WIN32) && !defined(MS_WIN64) +#if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__) /* Due to Mark Hammond */ static PyObject * time_clock(PyObject *self, PyObject *args) |