diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 16:11:00 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 16:11:00 +0000 |
| commit | 23563dc1e18506fb1b9f53dd1762c2c69ab8a0df (patch) | |
| tree | 1a70041b62c8aca241cb6809bb9d5f0232aaac26 /third_party/npapi | |
| parent | 7a6c57265ffece7140905e582f3a0a8082263388 (diff) | |
| download | chromium_src-23563dc1e18506fb1b9f53dd1762c2c69ab8a0df.zip chromium_src-23563dc1e18506fb1b9f53dd1762c2c69ab8a0df.tar.gz chromium_src-23563dc1e18506fb1b9f53dd1762c2c69ab8a0df.tar.bz2 | |
Fix some issues with compiling Mac plugin code with deprecation defines set
Makes the code compile under NP_NO_QUICKDRAW and NP_NO_CARBON (modulo some gyp stuff that 64-bit builds will need to prevent compiling the shim library), and makes the tweaking of DYLD_INSERT_LIBRARIES 32-bit only.
Also removes a QuickDraw variable left over from an earlier version of the QuickDraw support.
BUG=none
TEST=none; supports future 64-bit compilation
Review URL: http://codereview.chromium.org/597053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/npapi')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 4f08e45..0b335e6 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -722,6 +722,7 @@ typedef struct NP_Port * Non-standard event types that can be passed to HandleEvent */ /* BEGIN GOOGLE MODIFICATIONS */ +#ifndef NP_NO_CARBON enum NPEventType { NPEventType_GetFocusEvent = (osEvt + 16), NPEventType_LoseFocusEvent, @@ -737,6 +738,7 @@ enum NPEventType { #define loseFocusEvent (osEvt + 17) #define adjustCursorEvent (osEvt + 18) #endif +#endif /* NP_NO_CARBON */ /* END GOOGLE MODIFICATIONS */ #endif /* XP_MACOSX */ |