From 3f9863a303c0ce27e6a42d0a27ab3252188d01c2 Mon Sep 17 00:00:00 2001 From: jwh1 Date: Sat, 15 Jul 2000 00:06:44 +0000 Subject: Fri Jul 14 19:06:09 2000 John Heitmann --- PACE/pace/pthread.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PACE/pace/pthread.h b/PACE/pace/pthread.h index 89894f7798f..c4443b065db 100644 --- a/PACE/pace/pthread.h +++ b/PACE/pace/pthread.h @@ -36,9 +36,9 @@ extern "C" { IEEE Std 1003.1, 1996 Edition), Section 3.1.3. */ #if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_INLINE int pace_pthread_atfork (void (*prepare) (), - void (*parent) (), - void (*child) ()); + PACE_INLINE int pace_pthread_atfork (void (*prepare) (void), + void (*parent) (void), + void (*child) (void)); #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ /** @@ -580,8 +580,12 @@ extern "C" { */ #if (PACE_HAS_POSIX_NONUOF_FUNCS) PACE_INLINE int pace_pthread_once (pace_pthread_once_t * once_control, +<<<<<<< pthread.h + void (*void_routine) (void)); +======= void (*void_routine) ()); #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ +>>>>>>> 1.9 # define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT -- cgit v1.2.1