commit 84f304fd48e8314139279c7b5f8c3fdbc8a8bda2
author Glenn Kasten <gkasten@google.com> Thu Jan 05 07:38:29 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 05 07:38:29 2012 -0800
tree bcab8696fc3bc073e33fd1063e99b6827360bd8c
parent 4a48244edc93b50bb9af35f7ec03825c8f7471c9
parent 72f4f4cec34098e179ad5d257b07df3a514fcae2

Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"

driver/rsdRuntimeMath.cpp

diff --git a/driver/rsdRuntimeMath.cpp b/driver/rsdRuntimeMath.cpp
index d29da7e..b927ed2 100644
--- a/driver/rsdRuntimeMath.cpp
+++ b/driver/rsdRuntimeMath.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <cutils/compiler.h>
+
 #include "rsContext.h"
 #include "rsScriptC.h"
 #include "rsMatrix4x4.h"
@@ -306,7 +308,7 @@
     do {
         prev = *ptr;
         status = android_atomic_release_cas(prev, prev - value, ptr);
-    } while (__builtin_expect(status != 0, 0));
+    } while (CC_UNLIKELY(status != 0));
     return prev;
 }
 
@@ -323,7 +325,7 @@
     do {
         prev = *ptr;
         status = android_atomic_release_cas(prev, prev ^ value, ptr);
-    } while (__builtin_expect(status != 0, 0));
+    } while (CC_UNLIKELY(status != 0));
     return prev;
 }
 
@@ -333,7 +335,7 @@
         prev = *ptr;
         int32_t n = rsMin(value, prev);
         status = android_atomic_release_cas(prev, n, ptr);
-    } while (__builtin_expect(status != 0, 0));
+    } while (CC_UNLIKELY(status != 0));
     return prev;
 }
 
@@ -343,7 +345,7 @@
         prev = *ptr;
         int32_t n = rsMax(value, prev);
         status = android_atomic_release_cas(prev, n, ptr);
-    } while (__builtin_expect(status != 0, 0));
+    } while (CC_UNLIKELY(status != 0));
     return prev;
 }