diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /libs/pbd/pbd/pthread_utils.h | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/pbd/pbd/pthread_utils.h')
| -rw-r--r-- | libs/pbd/pbd/pthread_utils.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h index 3d89d5581e..f578339410 100644 --- a/libs/pbd/pbd/pthread_utils.h +++ b/libs/pbd/pbd/pthread_utils.h @@ -35,7 +35,6 @@ int pthread_create_and_store (std::string name, pthread_t *thread, void * (*st void pthread_cancel_one (pthread_t thread); void pthread_cancel_all (); void pthread_kill_all (int signum); -void pthread_exit_pbd (void* status); const char* pthread_name (); void pthread_set_name (const char* name); |