diff options
| author | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:06:44 +0000 |
|---|---|---|
| committer | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:06:44 +0000 |
| commit | 3f9863a303c0ce27e6a42d0a27ab3252188d01c2 (patch) | |
| tree | dee38f08b908e8ac597fa3198ba1e986f0f2d827 | |
| parent | d333c0a23462439f0499041ecdab65a8e7691765 (diff) | |
| download | ATCD-3f9863a303c0ce27e6a42d0a27ab3252188d01c2.tar.gz | |
Fri Jul 14 19:06:09 2000 John Heitmann <jwh1@cs.wustl.edu>
| -rw-r--r-- | PACE/pace/pthread.h | 10 |
1 files 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 |