Mesa (master): gallium: pipe_mutex_init() is of type void.
MichaŠKról
michal at kemper.freedesktop.org
Mon Mar 16 11:39:35 UTC 2009
Module: Mesa
Branch: master
Commit: bf6ed0b9625283fa7ca00f8fcdcf8fa4460befdd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf6ed0b9625283fa7ca00f8fcdcf8fa4460befdd
Author: Michal Krol <michal at vmware.com>
Date: Mon Mar 16 12:36:22 2009 +0100
gallium: pipe_mutex_init() is of type void.
Both the windows and fallback versions are void already.
---
src/gallium/include/pipe/p_atomic.h | 5 +----
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 348a938..773ae98 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 e59b999..e27b37c 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))
More information about the mesa-commit
mailing list