commit 34f083b1f3d45e60fb60bd11f9af0515cc3255fa
author David Turner <digit@android.com> Sat Apr 16 10:25:15 2011 -0700
committer Android Code Review <code-review@android.com> Sat Apr 16 10:25:15 2011 -0700
tree 0e4a8b817053e105a49d758a83cd49bf922a16c4
parent 218ccb4d4688d9708e440f59e883a2996725215a
parent 427cb6c3b018fab9933fdb98743709ee2282b62a

Merge "Fix mac build"

tools/emulator/opengl/shared/OpenglOsUtils/Android.mk

diff --git a/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk b/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk
index 7ca6ed8..5d350f1 100644
--- a/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk
+++ b/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk
@@ -18,27 +18,21 @@
 ### OpenglOsUtils  host ##############################################
 include $(CLEAR_VARS)
 
-ifeq ($(HOST_OS),linux)
+ifneq ($(HOST_OS),windows)
 
     LOCAL_SRC_FILES := \
         osProcessUnix.cpp \
         osThreadUnix.cpp \
         osDynLibrary.cpp
 
-else # !linux
-ifeq ($(HOST_OS),windows)
+else # windows
 
     LOCAL_SRC_FILES := \
         osProcessWin.cpp \
         osThreadWin.cpp \
         osDynLibrary.cpp
 
-else  # !windows
-
-    LOCAL_SRC_FILES :=
- 
 endif # windows
-endif # linux
 
 ifneq (,$(LOCAL_SRC_FILES))  # do not build if host platform not supported
 

tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h

diff --git a/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h b/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h
index 7fff7f7..82b31b3 100644
--- a/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h
+++ b/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h
@@ -18,8 +18,6 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#elif !defined(__linux__)
-#error "Unsupported platform"
 #endif
 
 namespace osUtils {
@@ -34,7 +32,7 @@
     {
 #ifdef _WIN32
         return m_proc.dwProcessId;
-#elif defined(__linux__)
+#else
         return(m_pid);
 #endif
     }
@@ -48,7 +46,7 @@
 private:
 #ifdef _WIN32
     PROCESS_INFORMATION m_proc;
-#elif defined(__linux__)
+#else
     int m_pid;
 #endif
 };