diff options
| author | Guido van Rossum <guido@python.org> | 1997-12-02 20:34:19 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-12-02 20:34:19 (GMT) |
| commit | 7bf22de75356e3e5f91027f0e9746db33b924147 (patch) | |
| tree | b3a77ffe676efc6e240eaec4fd49dbd65b9fdd5e | |
| parent | 91221c29f285bfd1a0595ee7a5335f6e23e49579 (diff) | |
| download | cpython-7bf22de75356e3e5f91027f0e9746db33b924147.zip cpython-7bf22de75356e3e5f91027f0e9746db33b924147.tar.gz cpython-7bf22de75356e3e5f91027f0e9746db33b924147.tar.bz2 | |
Patch for QNX, by Chris Herborth.
| -rw-r--r-- | Include/osdefs.h | 3 | ||||
| -rw-r--r-- | Modules/timemodule.c | 10 | ||||
| -rw-r--r-- | Parser/intrcheck.c | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Include/osdefs.h b/Include/osdefs.h index f914919..594fc10 100644 --- a/Include/osdefs.h +++ b/Include/osdefs.h @@ -44,12 +44,15 @@ PERFORMANCE OF THIS SOFTWARE. #define DELIM '\n' #endif +/* Mod by chrish: QNX has WATCOM, but isn't DOS */ +#if !defined(__QNX__) #if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(__TOS_OS2__) #define SEP '\\' #define ALTSEP '/' #define MAXPATHLEN 256 #define DELIM ';' #endif +#endif /* Filename separator */ #ifndef SEP diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 6390c40..3fedfa6 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -64,7 +64,7 @@ extern int ftime(); #endif /* MS_WINDOWS */ #endif /* HAVE_FTIME */ -#ifdef __WATCOMC__ +#if defined(__WATCOMC__) && !defined(__QNX__) #include <i86.h> #else #ifdef MS_WINDOWS @@ -77,7 +77,7 @@ extern int ftime(); #define altzone _altzone #endif /* MS_WIN16 */ #endif /* MS_WINDOWS */ -#endif /* !__WATCOMC__ */ +#endif /* !__WATCOMC__ || __QNX__ */ #ifdef MS_WIN32 /* Win32 has better clock replacement */ @@ -558,12 +558,12 @@ floatsleep(double secs) return -1; } #else /* !macintosh */ -#ifdef __WATCOMC__ +#if defined(__WATCOMC__) && !defined(__QNX__) /* XXX Can't interrupt this sleep */ Py_BEGIN_ALLOW_THREADS delay((int)(secs * 1000 + 0.5)); /* delay() uses milliseconds */ Py_END_ALLOW_THREADS -#else /* !__WATCOMC__ */ +#else /* !__WATCOMC__ || __QNX__ */ #ifdef MSDOS struct timeb t1, t2; double frac; @@ -614,7 +614,7 @@ floatsleep(double secs) #endif /* !PYOS_OS2 */ #endif /* !MS_WIN32 */ #endif /* !MSDOS */ -#endif /* !__WATCOMC__ */ +#endif /* !__WATCOMC__ || __QNX__ */ #endif /* !macintosh */ #endif /* !HAVE_SELECT */ return 0; diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c index 7fe6205..1320bd8 100644 --- a/Parser/intrcheck.c +++ b/Parser/intrcheck.c @@ -64,7 +64,7 @@ PyOS_InterruptOccurred() #endif /* QUICKWIN */ -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(__QNX__) #include <io.h> #endif @@ -160,7 +160,7 @@ extern int PyErr_CheckSignals(); /* ARGSUSED */ static RETSIGTYPE -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(__QNX__) intcatcher(int sig) /* So the C compiler shuts up */ #else /* _M_IX86 */ intcatcher(sig) |