diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/base/atomicops.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index da0eb8b..88550b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,6 +238,7 @@ SPINLOCK_INCLUDES = src/base/spinlock.h \ noinst_LTLIBRARIES += libspinlock.la libspinlock_la_SOURCES = src/base/spinlock.cc \ src/base/spinlock_internal.cc \ + src/base/atomicops-internals-x86.cc \ $(SPINLOCK_INCLUDES) LIBSPINLOCK = libwindows.la libspinlock.la libsysinfo.la liblogging.la diff --git a/src/base/atomicops.h b/src/base/atomicops.h index 7f01b4a..fc8fdc5 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h @@ -105,10 +105,10 @@ #include "base/atomicops-internals-arm-v6plus.h" #elif defined(ARMV3) #include "base/atomicops-internals-arm-generic.h" -#elif defined(_WIN32) -#include "base/atomicops-internals-windows.h" #elif defined(__GNUC__) && (defined(__i386) || defined(__x86_64__)) #include "base/atomicops-internals-x86.h" +#elif defined(_WIN32) +#include "base/atomicops-internals-windows.h" #elif defined(__linux__) && defined(__PPC__) #include "base/atomicops-internals-linuxppc.h" #else |