diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 03:21:50 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 03:21:50 +0000 |
| commit | 807bf6da2df5ab49c12d014cb1072a130a70312a (patch) | |
| tree | 2e7fdc263835145ca4551c569728bf0afc319749 /base/mac | |
| parent | f71c3b1fca29bb43bcf3bff85d07df2db2946257 (diff) | |
| download | chromium_src-807bf6da2df5ab49c12d014cb1072a130a70312a.zip chromium_src-807bf6da2df5ab49c12d014cb1072a130a70312a.tar.gz chromium_src-807bf6da2df5ab49c12d014cb1072a130a70312a.tar.bz2 | |
Fix building on the 10.7 SDK.
NSEventPhaseMayBegin showed up in the 10.8 SDK, so make sure that if we're building with anything before the 10.8 SDK, we define it.
BUG=138175
TEST=the Mac 64 builder goes green.
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/107163007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/sdk_forward_declarations.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h index bbaf962..721ef32 100644 --- a/base/mac/sdk_forward_declarations.h +++ b/base/mac/sdk_forward_declarations.h @@ -21,8 +21,7 @@ enum { NSEventPhaseStationary = 0x1 << 1, NSEventPhaseChanged = 0x1 << 2, NSEventPhaseEnded = 0x1 << 3, - NSEventPhaseCancelled = 0x1 << 4, - NSEventPhaseMayBegin = 0x1 << 5 + NSEventPhaseCancelled = 0x1 << 4 }; typedef NSUInteger NSEventPhase; @@ -77,4 +76,11 @@ typedef NSInteger NSWindowAnimationBehavior; @end #endif // MAC_OS_X_VERSION_10_7 +#if !defined(MAC_OS_X_VERSION_10_8) || \ + MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8 +enum { + NSEventPhaseMayBegin = 0x1 << 5 +}; +#endif // MAC_OS_X_VERSION_10_8 + #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_ |