Chromium Code Reviews| Index: src/include/atomic_ops.h |
| diff --git a/src/include/atomic_ops.h b/src/include/atomic_ops.h |
| index ef8a90275a5592fdfbdef00d32614dd31ee8815b..f6f554496a5f02089b57f535e067390f9fa54b38 100644 |
| --- a/src/include/atomic_ops.h |
| +++ b/src/include/atomic_ops.h |
| @@ -41,20 +41,10 @@ |
| #include "native_client/src/include/nacl_base.h" |
| -#ifdef __native_client__ |
| +#if defined(__native_client__) || defined(NACL_LINUX) |
|
Mark Seaborn
2012/09/15 02:53:51
This should be "#if defined(__native_client__) ||
petarj
2012/09/15 23:13:17
Done.
|
| #include "native_client/src/include/nacl/atomic_ops.h" |
|
Mark Seaborn
2012/09/15 02:53:51
Could you rename "nacl/atomic_ops.h" to "gcc/atomi
petarj
2012/09/15 23:13:17
Done.
|
| #elif NACL_OSX |
| #include "native_client/src/include/osx/atomic_ops_osx.h" |
| -#elif NACL_LINUX |
| - |
| -#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 |
| -#include "native_client/src/include/linux/x86/atomic_ops.h" |
| -#elif NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm |
| -#include "native_client/src/include/linux/arm/atomic_ops.h" |
| -#else |
| -#error Unknown platform! |
| -#endif |
| - |
| #elif NACL_WINDOWS |
| #include "native_client/src/include/win/atomic_ops_win32.h" |
| #else |