diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 21:04:35 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 21:04:35 +0000 |
| commit | 47b4af6eb34b58b497bbbafe031a0831e2bb2f1d (patch) | |
| tree | fc127c4e7f10add8ed49f73ae5b152d5a36d93f3 | |
| parent | cc4c974335ecf328de5a22e9e75254397f18702e (diff) | |
| download | chromium_src-47b4af6eb34b58b497bbbafe031a0831e2bb2f1d.zip chromium_src-47b4af6eb34b58b497bbbafe031a0831e2bb2f1d.tar.gz chromium_src-47b4af6eb34b58b497bbbafe031a0831e2bb2f1d.tar.bz2 | |
Add 64-bit guards to the Carbon plugin interpose code
We already don't compile the code to load the library for 64-bit, this makes it so we also don't try to build anything into it.
BUG=None
TEST=Eventually we should be able to compile for 64-bit on the Mac.
Review URL: http://codereview.chromium.org/2090007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47452 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/plugin_carbon_interpose_mac.cc | 4 | ||||
| -rw-r--r-- | chrome/common/plugin_carbon_interpose_constants_mac.cc | 4 | ||||
| -rw-r--r-- | chrome/common/plugin_carbon_interpose_constants_mac.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc index 3d5918c..e0e304f 100644 --- a/chrome/browser/plugin_carbon_interpose_mac.cc +++ b/chrome/browser/plugin_carbon_interpose_mac.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if !defined(__LP64__) + #include <Carbon/Carbon.h> #include "chrome/plugin/plugin_interpose_util_mac.h" @@ -187,3 +189,5 @@ __attribute__((used)) static const interpose_substitution substitutions[] INTERPOSE_FUNCTION(SetThemeCursor), INTERPOSE_FUNCTION(SetCursor), }; + +#endif // !__LP64__ diff --git a/chrome/common/plugin_carbon_interpose_constants_mac.cc b/chrome/common/plugin_carbon_interpose_constants_mac.cc index 68d0751..d7f6f91 100644 --- a/chrome/common/plugin_carbon_interpose_constants_mac.cc +++ b/chrome/common/plugin_carbon_interpose_constants_mac.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if !defined(__LP64__) + #include "chrome/common/plugin_carbon_interpose_constants_mac.h" namespace plugin_interpose_strings { @@ -11,3 +13,5 @@ const char kInterposeLibraryPath[] = "@executable_path/libplugin_carbon_interpose.dylib"; } // namespace plugin_interpose_strings + +#endif // !__LP64__ diff --git a/chrome/common/plugin_carbon_interpose_constants_mac.h b/chrome/common/plugin_carbon_interpose_constants_mac.h index f90085f..321dd84 100644 --- a/chrome/common/plugin_carbon_interpose_constants_mac.h +++ b/chrome/common/plugin_carbon_interpose_constants_mac.h @@ -5,6 +5,8 @@ #ifndef CHROME_COMMON_PLUGIN_CARBON_INTERPOSE_CONSTANTS_MAC_H_ #define CHROME_COMMON_PLUGIN_CARBON_INTERPOSE_CONSTANTS_MAC_H_ +#if !defined(__LP64__) + // Strings used in setting up Carbon interposing for the plugin process. namespace plugin_interpose_strings { @@ -13,4 +15,6 @@ extern const char kInterposeLibraryPath[]; } // namespace plugin_interpose_strings +#endif // !__LP64__ + #endif // CHROME_BROWSER_PLUGIN_CARBON_INTERPOSE_CONSTANTS_MAC_H_ |