Mass ANSIfication of function definitions. Doesn't cover all 'extern'
declarations yet, those come later.
diff --git a/Python/thread_sgi.h b/Python/thread_sgi.h
index 942097a..a1ebe6d 100644
--- a/Python/thread_sgi.h
+++ b/Python/thread_sgi.h
@@ -47,7 +47,7 @@
* exits. When that happens, we must see whether we have to exit as
* well (because of an PyThread_exit_prog()) or whether we should continue on.
*/
-static void exit_sig _P0()
+static void exit_sig(void)
{
d2printf(("exit_sig called\n"));
if (exiting && getpid() == my_pid) {
@@ -68,7 +68,7 @@
* This routine is called when a process calls exit(). If that wasn't
* done from the library, we do as if an PyThread_exit_prog() was intended.
*/
-static void maybe_exit _P0()
+static void maybe_exit(void)
{
dprintf(("maybe_exit called\n"));
if (exiting) {
@@ -82,7 +82,7 @@
/*
* Initialization.
*/
-static void PyThread__init_thread _P0()
+static void PyThread__init_thread(void)
{
#ifndef NO_EXIT_PROG
struct sigaction s;
@@ -143,7 +143,7 @@
* Thread support.
*/
-static void clean_threads _P0()
+static void clean_threads(void)
{
int i, j;
pid_t mypid, pid;
@@ -177,7 +177,7 @@
}
}
-int PyThread_start_new_thread _P2(func, void (*func) _P((void *)), arg, void *arg)
+int PyThread_start_new_thread(void (*func)(void *), void *arg)
{
#ifdef USE_DL
long addr, size;
@@ -235,12 +235,12 @@
return success < 0 ? 0 : 1;
}
-long PyThread_get_thread_ident _P0()
+long PyThread_get_thread_ident(void)
{
return getpid();
}
-static void do_PyThread_exit_thread _P1(no_cleanup, int no_cleanup)
+static void do_PyThread_exit_thread(int no_cleanup)
{
dprintf(("PyThread_exit_thread called\n"));
if (!initialized)
@@ -305,18 +305,18 @@
_exit(0);
}
-void PyThread_exit_thread _P0()
+void PyThread_exit_thread(void)
{
do_PyThread_exit_thread(0);
}
-void PyThread__exit_thread _P0()
+void PyThread__exit_thread(void)
{
do_PyThread_exit_thread(1);
}
#ifndef NO_EXIT_PROG
-static void do_PyThread_exit_prog _P2(status, int status, no_cleanup, int no_cleanup)
+static void do_PyThread_exit_prog(int status, int no_cleanup)
{
dprintf(("PyThread_exit_prog(%d) called\n", status));
if (!initialized)
@@ -329,12 +329,12 @@
do_PyThread_exit_thread(no_cleanup);
}
-void PyThread_exit_prog _P1(status, int status)
+void PyThread_exit_prog(int status)
{
do_PyThread_exit_prog(status, 0);
}
-void PyThread__exit_prog _P1(status, int status)
+void PyThread__exit_prog(int status)
{
do_PyThread_exit_prog(status, 1);
}
@@ -343,7 +343,7 @@
/*
* Lock support.
*/
-PyThread_type_lock PyThread_allocate_lock _P0()
+PyThread_type_lock PyThread_allocate_lock(void)
{
ulock_t lock;
@@ -358,13 +358,13 @@
return (PyThread_type_lock) lock;
}
-void PyThread_free_lock _P1(lock, PyThread_type_lock lock)
+void PyThread_free_lock(PyThread_type_lock lock)
{
dprintf(("PyThread_free_lock(%p) called\n", lock));
usfreelock((ulock_t) lock, shared_arena);
}
-int PyThread_acquire_lock _P2(lock, PyThread_type_lock lock, waitflag, int waitflag)
+int PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
{
int success;
@@ -380,7 +380,7 @@
return success;
}
-void PyThread_release_lock _P1(lock, PyThread_type_lock lock)
+void PyThread_release_lock(PyThread_type_lock lock)
{
dprintf(("PyThread_release_lock(%p) called\n", lock));
if (usunsetlock((ulock_t) lock) < 0)
@@ -390,7 +390,7 @@
/*
* Semaphore support.
*/
-PyThread_type_sema PyThread_allocate_sema _P1(value, int value)
+PyThread_type_sema PyThread_allocate_sema(int value)
{
usema_t *sema;
dprintf(("PyThread_allocate_sema called\n"));
@@ -403,13 +403,13 @@
return (PyThread_type_sema) sema;
}
-void PyThread_free_sema _P1(sema, PyThread_type_sema sema)
+void PyThread_free_sema(PyThread_type_sema sema)
{
dprintf(("PyThread_free_sema(%p) called\n", sema));
usfreesema((usema_t *) sema, shared_arena);
}
-int PyThread_down_sema _P2(sema, PyThread_type_sema sema, waitflag, int waitflag)
+int PyThread_down_sema(PyThread_type_sema sema, int waitflag)
{
int success;
@@ -424,7 +424,7 @@
return success;
}
-void PyThread_up_sema _P1(sema, PyThread_type_sema sema)
+void PyThread_up_sema(PyThread_type_sema sema)
{
dprintf(("PyThread_up_sema(%p)\n", sema));
if (usvsema((usema_t *) sema) < 0)
@@ -446,7 +446,7 @@
static int nkeys = 0;
static PyThread_type_lock keymutex = NULL;
-static struct key *find_key _P2(key, int key, value, void *value)
+static struct key *find_key(int key, void *value)
{
struct key *p;
long id = PyThread_get_thread_ident();
@@ -469,14 +469,14 @@
return p;
}
-int PyThread_create_key _P0()
+int PyThread_create_key(void)
{
if (keymutex == NULL)
keymutex = PyThread_allocate_lock();
return ++nkeys;
}
-void PyThread_delete_key _P1(key, int key)
+void PyThread_delete_key(int key)
{
struct key *p, **q;
PyThread_acquire_lock(keymutex, 1);
@@ -493,7 +493,7 @@
PyThread_release_lock(keymutex);
}
-int PyThread_set_key_value _P2(key, int key, value, void *value)
+int PyThread_set_key_value(int key, void *value)
{
struct key *p = find_key(key, value);
if (p == NULL)
@@ -502,7 +502,7 @@
return 0;
}
-void *PyThread_get_key_value _P1(key, int key)
+void *PyThread_get_key_value(int key)
{
struct key *p = find_key(key, NULL);
if (p == NULL)