diff options
| -rw-r--r-- | src/gallium/include/pipe/p_atomic.h | 5 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_thread.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/include/pipe/p_atomic.h b/src/gallium/include/pipe/p_atomic.h index 348a938e17..773ae98343 100644 --- a/src/gallium/include/pipe/p_atomic.h +++ b/src/gallium/include/pipe/p_atomic.h @@ -84,10 +84,7 @@ struct pipe_atomic { static INLINE void p_atomic_set(struct pipe_atomic *v, int32_t i) { - int ret; - ret = pipe_mutex_init(v->mutex); - if (ret) - abort(); + pipe_mutex_init(v->mutex); pipe_mutex_lock(v->mutex); v->count = i; pipe_mutex_unlock(v->mutex); diff --git a/src/gallium/include/pipe/p_thread.h b/src/gallium/include/pipe/p_thread.h index e59b999b9a..e27b37cf9d 100644 --- a/src/gallium/include/pipe/p_thread.h +++ b/src/gallium/include/pipe/p_thread.h @@ -73,7 +73,7 @@ typedef pthread_cond_t pipe_condvar; static pipe_mutex mutex = PTHREAD_MUTEX_INITIALIZER #define pipe_mutex_init(mutex) \ - pthread_mutex_init(&(mutex), NULL) + (void) pthread_mutex_init(&(mutex), NULL) #define pipe_mutex_destroy(mutex) \ pthread_mutex_destroy(&(mutex)) |