summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 23:47:18 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 23:47:18 +0000
commit9ec5273f4d103f6f08ff4708656fe592cdcb2119 (patch)
treec9815b86ba1d52c6f367b64f4007efa1bada0826 /remoting
parent68e801f58b3adedb3d3effdcf1fe1065be82fc61 (diff)
downloadchromium_src-9ec5273f4d103f6f08ff4708656fe592cdcb2119.zip
chromium_src-9ec5273f4d103f6f08ff4708656fe592cdcb2119.tar.gz
chromium_src-9ec5273f4d103f6f08ff4708656fe592cdcb2119.tar.bz2
Fix up the define usage so that we actually handle OSX specific stuff correctly.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2784001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/simple_host_process.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index d4abc40..613cf52 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -32,7 +32,7 @@
#elif defined(OS_LINUX)
#include "remoting/host/capturer_linux.h"
#include "remoting/host/event_executor_linux.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
#include "remoting/host/capturer_mac.h"
#include "remoting/host/event_executor_mac.h"
#endif
@@ -92,7 +92,7 @@ int main(int argc, char** argv) {
#elif defined(OS_LINUX)
capturer.reset(new remoting::CapturerLinux());
executor.reset(new remoting::EventExecutorLinux());
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
capturer.reset(new remoting::CapturerMac());
executor.reset(new remoting::EventExecutorMac());
#endif