diff options
Diffstat (limited to 'PACE/pace/pthread.h')
| -rw-r--r-- | PACE/pace/pthread.h | 4 |
1 files changed, 0 insertions, 4 deletions
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 |