From 620dd06d155ec900ab9db3a8611e128571f4c9cb Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 3 May 2001 20:42:28 +0000 Subject: [PATCH] * include/pthread.h (pthread_cleanup_push): Eliminate space preceding arguments. (pthread_cleanup_pop): Ditto. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/include/pthread.h | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f28587d7b..b8b70558e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +Thu May 3 16:37:55 2001 Christopher Faylor + + * include/pthread.h (pthread_cleanup_push): Eliminate space preceding + arguments. + (pthread_cleanup_pop): Ditto. + Thu May 3 18:16:00 2001 Corinna Vinschen * net.cc (wsock_init): Rename `was_in_progress' to `wsock_started' diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h index 6f8f9025a..4b03bbb90 100644 --- a/winsup/cygwin/include/pthread.h +++ b/winsup/cygwin/include/pthread.h @@ -1,6 +1,6 @@ /* pthread.h: POSIX pthread interface - Copyright 1996, 1997, 1998 Cygnus Solutions. + Copyright 1996, 1997, 1998, 1999, 20000, 2001 Red Hat, Inc. Written by Marco Fuykschot @@ -98,14 +98,14 @@ int pthread_attr_setstacksize (pthread_attr_t *, size_t); int pthread_cancel (pthread_t); /* Macros for cleanup_push and pop; * The function definitions are -void pthread_cleanup_push(void (*routine)(void*), void *arg); -void pthread_cleanup_pop(int execute); +void pthread_cleanup_push (void (*routine)(void*), void *arg); +void pthread_cleanup_pop (int execute); */ typedef void __cleanup_routine_type (void *); -#define pthread_cleanup_push (fn, arg) { __cleanup_routine_type __cleanup_routine=fn; \ +#define pthread_cleanup_push(fn, arg) { __cleanup_routine_type __cleanup_routine=fn; \ void *__cleanup_param=arg; -#define pthread_cleanup_pop (execute) if (execute) __cleanup_routine(__cleanup_param); } +#define pthread_cleanup_pop(execute) if (execute) __cleanup_routine(__cleanup_param); } /* Condition variables */ int pthread_cond_broadcast (pthread_cond_t *); @@ -169,7 +169,6 @@ void pthread_testcancel (void); int pthread_suspend (pthread_t); int pthread_continue (pthread_t); - #ifdef __cplusplus } #endif