diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 22:03:04 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 22:03:04 +0000 |
| commit | 2980234571ab83756a11ed71497d1132687aaf88 (patch) | |
| tree | 88115f2cbb94ceed1299a3b1a73b18085e4432b8 /third_party/npapi | |
| parent | c30cf1ab3662fbe9c5ed23f5e575061cf68591ae (diff) | |
| download | chromium_src-2980234571ab83756a11ed71497d1132687aaf88.zip chromium_src-2980234571ab83756a11ed71497d1132687aaf88.tar.gz chromium_src-2980234571ab83756a11ed71497d1132687aaf88.tar.bz2 | |
Revert r2927 and r2930, which were themselves reversions of prior changelists.
(Misc. build fixes for KJS build and remnants of unforking a couple of files.)
Review URL: http://codereview.chromium.org/6321
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/npapi')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 11f35ab..db74e55 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -525,6 +525,14 @@ typedef struct _NPPrint } print; } NPPrint; +// BEGIN GOOGLE MODIFICATIONS +#ifdef XP_MACOSX +typedef NPNSMenu NPMenu; +#else +typedef void * NPMenu; +#endif +// END GOOGLE MODIFICATIONS + #ifdef XP_MACOSX typedef EventRecord NPEvent; #elif defined(XP_WIN) |