diff options
| author | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 15:09:56 +0000 |
|---|---|---|
| committer | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 15:09:56 +0000 |
| commit | 29535ffd4ab3d829d766a30a18217091f4b12011 (patch) | |
| tree | 0ef8a2b844d19df2e9a283d6ba6872cb695095f2 /base | |
| parent | 4bb1650eab539db9a51380ac8e0511d6a24150ee (diff) | |
| download | chromium_src-29535ffd4ab3d829d766a30a18217091f4b12011.zip chromium_src-29535ffd4ab3d829d766a30a18217091f4b12011.tar.gz chromium_src-29535ffd4ab3d829d766a30a18217091f4b12011.tar.bz2 | |
mac: use the preprocessor for the mac header
The mac header is using conditional compilation to become neutral for other platforms.
Unfortunately it won't work for all gyp backends, as the gyp file is removing the header
from the sources for non mac platforms. Better use conditionals in the few places
where we use it. That also spares us to explain the hack.
Review URL: http://codereview.chromium.org/8822010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/message_pump_libevent.cc | 3 | ||||
| -rw-r--r-- | base/shared_memory_unittest.cc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/base/message_pump_libevent.cc b/base/message_pump_libevent.cc index 23b707e..ff0d40d 100644 --- a/base/message_pump_libevent.cc +++ b/base/message_pump_libevent.cc @@ -11,6 +11,9 @@ #include "base/compiler_specific.h" #include "base/eintr_wrapper.h" #include "base/logging.h" +#if defined(OS_MACOSX) +#include "base/mac/scoped_nsautorelease_pool.h" +#endif #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time.h" diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc index 41b8ba5..ef5cf2e 100644 --- a/base/shared_memory_unittest.cc +++ b/base/shared_memory_unittest.cc @@ -3,6 +3,9 @@ // found in the LICENSE file. #include "base/basictypes.h" +#if defined(OS_MACOSX) +#include "base/mac/scoped_nsautorelease_pool.h" +#endif #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/test/multiprocess_test.h" |