summaryrefslogtreecommitdiffstats
path: root/Include/pythread.h
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-07-09 00:55:06 (GMT)
committerFred Drake <fdrake@acm.org>2000-07-09 00:55:06 (GMT)
commit3cf4d2b3ea93eee40d34b1ae4845497d0cd3fcec (patch)
treef4ad8a294b76cbf0f43823163a2eac21be7334c6 /Include/pythread.h
parentea9cb5aebf38741871ad4f28971dcd23ddd77ad2 (diff)
downloadcpython-3cf4d2b3ea93eee40d34b1ae4845497d0cd3fcec.zip
cpython-3cf4d2b3ea93eee40d34b1ae4845497d0cd3fcec.tar.gz
cpython-3cf4d2b3ea93eee40d34b1ae4845497d0cd3fcec.tar.bz2
ANSI-fication and Py_PROTO extermination.
Diffstat (limited to 'Include/pythread.h')
-rw-r--r--Include/pythread.h52
1 files changed, 22 insertions, 30 deletions
diff --git a/Include/pythread.h b/Include/pythread.h
index 7d4e0ea..e40eb57 100644
--- a/Include/pythread.h
+++ b/Include/pythread.h
@@ -1,6 +1,3 @@
-#ifndef Py_PYTHREAD_H
-#define Py_PYTHREAD_H
-
/***********************************************************
Copyright (c) 2000, BeOpen.com.
Copyright (c) 1995-2000, Corporation for National Research Initiatives.
@@ -11,17 +8,12 @@ See the file "Misc/COPYRIGHT" for information on usage and
redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
******************************************************************/
+#ifndef Py_PYTHREAD_H
+#define Py_PYTHREAD_H
+
#define NO_EXIT_PROG /* don't define PyThread_exit_prog() */
/* (the result is no use of signals on SGI) */
-#ifndef Py_PROTO
-#if defined(__STDC__) || defined(__cplusplus)
-#define Py_PROTO(args) args
-#else
-#define Py_PROTO(args) ()
-#endif
-#endif
-
typedef void *PyThread_type_lock;
typedef void *PyThread_type_sema;
@@ -29,35 +21,35 @@ typedef void *PyThread_type_sema;
extern "C" {
#endif
-DL_IMPORT(void) PyThread_init_thread Py_PROTO((void));
-DL_IMPORT(int) PyThread_start_new_thread Py_PROTO((void (*)(void *), void *));
-DL_IMPORT(void) PyThread_exit_thread Py_PROTO((void));
-DL_IMPORT(void) PyThread__PyThread_exit_thread Py_PROTO((void));
-DL_IMPORT(long) PyThread_get_thread_ident Py_PROTO((void));
+DL_IMPORT(void) PyThread_init_thread(void);
+DL_IMPORT(int) PyThread_start_new_thread(void (*)(void *), void *);
+DL_IMPORT(void) PyThread_exit_thread(void);
+DL_IMPORT(void) PyThread__PyThread_exit_thread(void);
+DL_IMPORT(long) PyThread_get_thread_ident(void);
-DL_IMPORT(PyThread_type_lock) PyThread_allocate_lock Py_PROTO((void));
-DL_IMPORT(void) PyThread_free_lock Py_PROTO((PyThread_type_lock));
-DL_IMPORT(int) PyThread_acquire_lock Py_PROTO((PyThread_type_lock, int));
+DL_IMPORT(PyThread_type_lock) PyThread_allocate_lock(void);
+DL_IMPORT(void) PyThread_free_lock(PyThread_type_lock);
+DL_IMPORT(int) PyThread_acquire_lock(PyThread_type_lock, int);
#define WAIT_LOCK 1
#define NOWAIT_LOCK 0
-DL_IMPORT(void) PyThread_release_lock Py_PROTO((PyThread_type_lock));
+DL_IMPORT(void) PyThread_release_lock(PyThread_type_lock);
-DL_IMPORT(PyThread_type_sema) PyThread_allocate_sema Py_PROTO((int));
-DL_IMPORT(void) PyThread_free_sema Py_PROTO((PyThread_type_sema));
-DL_IMPORT(int) PyThread_down_sema Py_PROTO((PyThread_type_sema, int));
+DL_IMPORT(PyThread_type_sema) PyThread_allocate_sema(int);
+DL_IMPORT(void) PyThread_free_sema(PyThread_type_sema);
+DL_IMPORT(int) PyThread_down_sema(PyThread_type_sema, int);
#define WAIT_SEMA 1
#define NOWAIT_SEMA 0
-DL_IMPORT(void) PyThread_up_sema Py_PROTO((PyThread_type_sema));
+DL_IMPORT(void) PyThread_up_sema(PyThread_type_sema);
#ifndef NO_EXIT_PROG
-DL_IMPORT(void) PyThread_exit_prog Py_PROTO((int));
-DL_IMPORT(void) PyThread__PyThread_exit_prog Py_PROTO((int));
+DL_IMPORT(void) PyThread_exit_prog(int);
+DL_IMPORT(void) PyThread__PyThread_exit_prog(int);
#endif
-DL_IMPORT(int) PyThread_create_key Py_PROTO((void));
-DL_IMPORT(void) PyThread_delete_key Py_PROTO((int));
-DL_IMPORT(int) PyThread_set_key_value Py_PROTO((int, void *));
-DL_IMPORT(void *) PyThread_get_key_value Py_PROTO((int));
+DL_IMPORT(int) PyThread_create_key(void);
+DL_IMPORT(void) PyThread_delete_key(int);
+DL_IMPORT(int) PyThread_set_key_value(int, void *);
+DL_IMPORT(void *) PyThread_get_key_value(int);
#ifdef __cplusplus
}