diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-25 22:58:57 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-25 22:58:57 +0300 |
| commit | accce6be6eba077aaa538c8b0f4d1a839d08abe6 (patch) | |
| tree | 4b3b3b110f6d30f408577b12710f0925376eb883 /include | |
| parent | a98481354e99f4bd27ca91e74518999eb5dee359 (diff) | |
| parent | 49e7114fdb3520462a40f22d17f267686a5f1f3f (diff) | |
| download | mariadb-git-accce6be6eba077aaa538c8b0f4d1a839d08abe6.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'include')
| -rw-r--r-- | include/atomic/x86-gcc.h | 2 | ||||
| -rw-r--r-- | include/my_atomic.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h index 77c32f8d70c..61b94a48568 100644 --- a/include/atomic/x86-gcc.h +++ b/include/atomic/x86-gcc.h @@ -88,7 +88,7 @@ */ #define make_atomic_add_body64 \ int64 tmp=*a; \ - while (!my_atomic_cas64(a, &tmp, tmp+v)); \ + while (!my_atomic_cas64(a, &tmp, tmp+v)) ; \ v=tmp; /* diff --git a/include/my_atomic.h b/include/my_atomic.h index 9914fd2428f..8ba3e201730 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -77,13 +77,13 @@ #ifndef make_atomic_add_body #define make_atomic_add_body(S) \ int ## S tmp=*a; \ - while (!my_atomic_cas ## S(a, &tmp, tmp+v)); \ + while (!my_atomic_cas ## S(a, &tmp, tmp+v)) ; \ v=tmp; #endif #ifndef make_atomic_fas_body #define make_atomic_fas_body(S) \ int ## S tmp=*a; \ - while (!my_atomic_cas ## S(a, &tmp, v)); \ + while (!my_atomic_cas ## S(a, &tmp, v)) ; \ v=tmp; #endif #ifndef make_atomic_load_body |