summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-01-01 18:41:33 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-01-01 18:41:33 (GMT)
commita6e975801e37bef27deb3207f6fc8f0c59affb46 (patch)
treee70dffff459f4a6f6041604334b4cd5ea74a0bcb /Python
parent65293680aa6a4f62024eb25ba8ff4c731c126a60 (diff)
downloadcpython-a6e975801e37bef27deb3207f6fc8f0c59affb46.zip
cpython-a6e975801e37bef27deb3207f6fc8f0c59affb46.tar.gz
cpython-a6e975801e37bef27deb3207f6fc8f0c59affb46.tar.bz2
Patch #497098: build support for GNU/Hurd.
Diffstat (limited to 'Python')
-rw-r--r--Python/thread_cthread.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/Python/thread_cthread.h b/Python/thread_cthread.h
index 8487cc2..ccd774d 100644
--- a/Python/thread_cthread.h
+++ b/Python/thread_cthread.h
@@ -1,6 +1,11 @@
+#ifdef MACH_C_THREADS
#include <mach/cthreads.h>
+#endif
+#ifdef HURD_C_THREADS
+#include <cthreads.h>
+#endif
/*
* Initialization.
@@ -8,7 +13,14 @@
static void
PyThread__init_thread(void)
{
- cthread_init();
+#ifndef HURD_C_THREADS
+ /* Roland McGrath said this should not be used since this is
+ done while linking to threads */
+ cthread_init();
+#else
+/* do nothing */
+ ;
+#endif
}
/*
@@ -127,10 +139,10 @@ PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
if (waitflag) { /* blocking */
- mutex_lock(lock);
+ mutex_lock((mutex_t)lock);
success = TRUE;
} else { /* non blocking */
- success = mutex_try_lock(lock);
+ success = mutex_try_lock((mutex_t)lock);
}
dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
return success;