diff options
| author | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:08:19 +0000 |
|---|---|---|
| committer | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:08:19 +0000 |
| commit | 7265aad539786b2095519dbdaf3be570fa137557 (patch) | |
| tree | 965a59c150f71e2e1dff1f5daa94c8670776ea6e | |
| parent | 3f9863a303c0ce27e6a42d0a27ab3252188d01c2 (diff) | |
| download | ATCD-7265aad539786b2095519dbdaf3be570fa137557.tar.gz | |
Fri Jul 14 19:06:09 2000 John Heitmann <jwh1@cs.wustl.edu>
| -rw-r--r-- | PACE/ChangeLog | 8 | ||||
| -rw-r--r-- | PACE/pace/pthread.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/PACE/ChangeLog b/PACE/ChangeLog index fb2263fb944..329f822c831 100644 --- a/PACE/ChangeLog +++ b/PACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 14 19:06:09 2000 John Heitmann <jwh1@cs.wustl.edu> + + * pace/pthread.h: + Added (void) in arguments to pointers to functions + which were otherwise interpreted as (...) args. + Fri Jul 14 18:50:07 2000 Luther J Baker <luther@cs.wustl.edu> * pace/win32/unistd.h: @@ -49,7 +55,7 @@ Fri Jul 14 15:55:24 2000 Joe Hoffert <joeh@cs.wustl.edu> * pace/Makefile: Added defining appropriate macros when subsetting PACE into POSIX units of functionality. - + * pace/aio.h: * pace/assert.h: * pace/ctype.h: diff --git a/PACE/pace/pthread.h b/PACE/pace/pthread.h index c4443b065db..c053dad5958 100644 --- a/PACE/pace/pthread.h +++ b/PACE/pace/pthread.h @@ -580,12 +580,8 @@ 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 |