commit 68c19686e8f9b5a88e3b2729a453d03516be79f1
author Andreas Gampe <agampe@google.com> Mon Sep 29 14:59:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 29 14:59:50 2014 +0000
tree 41a5154633e3da54ebe2196afc1c28bc88e622a7
parent aa68f3e9dd673fee8a96c80b9f4bb816cd42e680
parent c00994df055f09926510d228da5a30510b50a9b6

Merge "Fix mac build for nativebridge tests."

libnativebridge/tests/PreInitializeNativeBridge_test.cpp

diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
index 9b487d7..84078f7 100644
--- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
+++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
@@ -31,8 +31,8 @@
 static constexpr const char* kTestData = "PreInitializeNativeBridge test.";
 
 TEST_F(NativeBridgeTest, PreInitializeNativeBridge) {
-#ifndef __APPLE_         // Mac OS does not support bind-mount.
-#ifndef HAVE_ANDROID_OS  // Cannot write into the hard-wired location.
+#ifndef __APPLE__         // Mac OS does not support bind-mount.
+#ifndef HAVE_ANDROID_OS   // Cannot write into the hard-wired location.
     // Try to create our mount namespace.
     if (unshare(CLONE_NEWNS) != -1) {
         // Create a dummy file.