diff options
-rw-r--r-- | Include/pythread.h | 36 | ||||
-rw-r--r-- | Include/thread.h | 36 | ||||
-rw-r--r-- | Modules/almodule.c | 1 |
3 files changed, 37 insertions, 36 deletions
diff --git a/Include/pythread.h b/Include/pythread.h index e29f7e6..806882f 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -1,10 +1,12 @@ #ifndef _THREAD_H_included #define _THREAD_H_included +#ifndef PROTO #if defined(__STDC__) || defined(__cplusplus) -#define _P(args) args +#define PROTO(args) args #else -#define _P(args) () +#define PROTO(args) () +#endif #endif typedef void *type_lock; @@ -14,30 +16,28 @@ typedef void *type_sema; extern "C" { #endif -void init_thread _P((void)); -int start_new_thread _P((void (*)(void *), void *)); -void exit_thread _P((void)); -void _exit_thread _P((void)); +void init_thread PROTO((void)); +int start_new_thread PROTO((void (*)(void *), void *)); +void exit_thread PROTO((void)); +void _exit_thread PROTO((void)); -type_lock allocate_lock _P((void)); -void free_lock _P((type_lock)); -int acquire_lock _P((type_lock, int)); +type_lock allocate_lock PROTO((void)); +void free_lock PROTO((type_lock)); +int acquire_lock PROTO((type_lock, int)); #define WAIT_LOCK 1 #define NOWAIT_LOCK 0 -void release_lock _P((type_lock)); +void release_lock PROTO((type_lock)); -type_sema allocate_sema _P((int)); -void free_sema _P((type_sema)); -void down_sema _P((type_sema)); -void up_sema _P((type_sema)); +type_sema allocate_sema PROTO((int)); +void free_sema PROTO((type_sema)); +void down_sema PROTO((type_sema)); +void up_sema PROTO((type_sema)); -void exit_prog _P((int)); -void _exit_prog _P((int)); +void exit_prog PROTO((int)); +void _exit_prog PROTO((int)); #ifdef __cplusplus } #endif -#undef _P - #endif diff --git a/Include/thread.h b/Include/thread.h index e29f7e6..806882f 100644 --- a/Include/thread.h +++ b/Include/thread.h @@ -1,10 +1,12 @@ #ifndef _THREAD_H_included #define _THREAD_H_included +#ifndef PROTO #if defined(__STDC__) || defined(__cplusplus) -#define _P(args) args +#define PROTO(args) args #else -#define _P(args) () +#define PROTO(args) () +#endif #endif typedef void *type_lock; @@ -14,30 +16,28 @@ typedef void *type_sema; extern "C" { #endif -void init_thread _P((void)); -int start_new_thread _P((void (*)(void *), void *)); -void exit_thread _P((void)); -void _exit_thread _P((void)); +void init_thread PROTO((void)); +int start_new_thread PROTO((void (*)(void *), void *)); +void exit_thread PROTO((void)); +void _exit_thread PROTO((void)); -type_lock allocate_lock _P((void)); -void free_lock _P((type_lock)); -int acquire_lock _P((type_lock, int)); +type_lock allocate_lock PROTO((void)); +void free_lock PROTO((type_lock)); +int acquire_lock PROTO((type_lock, int)); #define WAIT_LOCK 1 #define NOWAIT_LOCK 0 -void release_lock _P((type_lock)); +void release_lock PROTO((type_lock)); -type_sema allocate_sema _P((int)); -void free_sema _P((type_sema)); -void down_sema _P((type_sema)); -void up_sema _P((type_sema)); +type_sema allocate_sema PROTO((int)); +void free_sema PROTO((type_sema)); +void down_sema PROTO((type_sema)); +void up_sema PROTO((type_sema)); -void exit_prog _P((int)); -void _exit_prog _P((int)); +void exit_prog PROTO((int)); +void _exit_prog PROTO((int)); #ifdef __cplusplus } #endif -#undef _P - #endif diff --git a/Modules/almodule.c b/Modules/almodule.c index 26bf38f..d731eff 100644 --- a/Modules/almodule.c +++ b/Modules/almodule.c @@ -490,6 +490,7 @@ al_getstatus (self, args) static struct methodlist port_methods[] = { {"closeport", al_closeport}, + {"close", al_closeport}, {"getfd", al_getfd}, {"fileno", al_getfd}, {"getfilled", al_getfilled}, |