Fixed Solaris Atomics build issues

39ca1f0e · Mikael Ronstrom · 1ee57905 · 39ca1f0e · 39ca1f0e
Commit 39ca1f0e authored Dec 18, 2009 by Mikael Ronstrom
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

configure.in configure.in +3 -5

include/atomic/nolock.h include/atomic/nolock.h +2 -1

No files found.
--- a/configure.in
+++ b/configure.in
@@ -1922,9 +1922,9 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
               [mysql_cv_solaris_atomic],
  [AC_RUN_IFELSE(
     [AC_LANG_PROGRAM(
-        [
+        [[
        #include <atomic.h>
-        ]
+        ]],
     [[
        int foo = -10; int bar = 10;
        int64_t foo64 = -10; int64_t bar64 = 10;
@@ -1944,9 +1944,7 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
        bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
        if (bar64)
          return -1;
-        foo64 = atomic_or_64((volatile uint64_t *)&bar64, 0);
+        atomic_or_64((volatile uint64_t *)&bar64, 0);
-        if (foo64)
-          return -1;
        return 0;
     ]]
     )],

--- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h
@@ -17,7 +17,8 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
-    || defined(HAVE_GCC_ATOMIC_BUILTINS)
+    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
+    || defined(HAVE_SOLARIS_ATOMIC)
 #  ifdef MY_ATOMIC_MODE_DUMMY
 #    define LOCK_prefix ""