]> code.delx.au - pulseaudio/commitdiff
fix a compiler warning on ARM due to missing cast, patch from Jyri Sarha
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Jun 2008 08:40:30 +0000 (08:40 +0000)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Jun 2008 08:40:30 +0000 (08:40 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2493 fefdeb5f-60dc-0310-8127-8f9354f1896f

src/pulsecore/atomic.h

index ad3dca30c87f045b82d7a5e2805a3faf3025d2a5..ee83a4b12d44640636f7b8515830ce5d62768d98 100644 (file)
@@ -380,9 +380,9 @@ static inline int pa_atomic_dec(pa_atomic_t *a) {
 
 /* Returns non-zero when the operation was successful. */
 static inline int pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) {
-    int failed = 1;
+    pa_bool_t failed;
     do {
-      failed = __kernel_cmpxchg(old_i, new_i, &a->value);
+      failed = !!__kernel_cmpxchg(old_i, new_i, &a->value);
     } while(failed && a->value == old_i);
     return !failed;
 }
@@ -404,10 +404,10 @@ static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
 }
 
 static inline int pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
-    int failed = 1;
+    pa_bool_t failed;
     do {
-        failed = __kernel_cmpxchg_u((unsigned long) old_p, (unsigned long) new_p, &a->value);
-    } while(failed && a->value == old_p);
+        failed = !!__kernel_cmpxchg_u((unsigned long) old_p, (unsigned long) new_p, &a->value);
+    } while(failed && a->value == (unsigned long) old_p);
     return !failed;
 }