X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2Fportability%2FSysMembarrier.cpp;h=9b3735c965603e8cbfa985aa7f4566522191b820;hp=1bc2a7ab2d955eb48c5c9b069a72bf8c7743ffa1;hb=ef20f6380813110434dae416f0abe964e476c8c6;hpb=2ccbaf9e215b23a357ad6f07de0d1374597b47b8

diff --git a/folly/portability/SysMembarrier.cpp b/folly/portability/SysMembarrier.cpp
index 1bc2a7ab..9b3735c9 100644
--- a/folly/portability/SysMembarrier.cpp
+++ b/folly/portability/SysMembarrier.cpp
@@ -26,10 +26,12 @@
 #define FOLLY_USE_SYS_MEMBARRIER 1
 #if !defined(__NR_membarrier)
 #define __NR_membarrier 324
+#endif
+#if FOLLY_HAVE_LINUX_MEMBARRIER_H
+#include <linux/membarrier.h> // @manual
+#else
 #define MEMBARRIER_CMD_QUERY 0
 #define MEMBARRIER_CMD_SHARED 1
-#elif FOLLY_HAVE_LINUX_MEMBARRIER_H
-#include <linux/membarrier.h> // @manual
 #endif
 #endif
 
@@ -60,5 +62,5 @@ int sysMembarrier() {
   return -1;
 #endif
 }
-}
-}
+} // namespace detail
+} // namespace folly