summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-04-14 15:07:46 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-04-14 15:07:46 (GMT)
commitf24de1e99049fb0b4c35afd76f91a964e08752de (patch)
treeab7ff91507ad4cc714ece3ea15ade56c51c7001f
parent7580149bde28532ef16924328af0f0543411c3b4 (diff)
downloadcpython-f24de1e99049fb0b4c35afd76f91a964e08752de.zip
cpython-f24de1e99049fb0b4c35afd76f91a964e08752de.tar.gz
cpython-f24de1e99049fb0b4c35afd76f91a964e08752de.tar.bz2
Patch #1470300: Port _hotshot to QNX4.25 port.
-rw-r--r--Modules/_hotshot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c
index 6a78fd2..2ee4eb9 100644
--- a/Modules/_hotshot.c
+++ b/Modules/_hotshot.c
@@ -26,7 +26,7 @@ typedef __int64 hs_time;
#ifndef HAVE_GETTIMEOFDAY
#error "This module requires gettimeofday() on non-Windows platforms!"
#endif
-#if (defined(PYOS_OS2) && defined(PYCC_GCC))
+#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || defined(__QNX__)
#include <sys/time.h>
#else
#include <sys/resource.h>
@@ -918,7 +918,7 @@ calibrate(void)
#endif
}
#if defined(MS_WINDOWS) || defined(PYOS_OS2) || \
- defined(__VMS)
+ defined(__VMS) || defined (__QNX__)
rusage_diff = -1;
#else
{