summaryrefslogtreecommitdiffstats
path: root/src/gallium/include
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2009-03-16 12:36:22 +0100
committerMichal Krol <[email protected]>2009-03-16 12:36:22 +0100
commitbf6ed0b9625283fa7ca00f8fcdcf8fa4460befdd (patch)
treee3168af1fc7ac809ac85f439482f3664b1eba295 /src/gallium/include
parent13dad5294b793cb1e4fe2b18e4d33c26096253a5 (diff)
gallium: pipe_mutex_init() is of type void.
Both the windows and fallback versions are void already.
Diffstat (limited to 'src/gallium/include')
-rw-r--r--src/gallium/include/pipe/p_atomic.h5
-rw-r--r--src/gallium/include/pipe/p_thread.h2
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 348a938e175..773ae983436 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 e59b999b9af..e27b37cf9dd 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))