diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 22:23:39 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 22:23:39 +0000 |
| commit | 629494519869e2e9b0f06f3a459acc7805e90e25 (patch) | |
| tree | 9355dac5e22b13aed49e0d7bbc27bb208f1de243 /chrome/app | |
| parent | 199f2304434b798fd28fe09a437fbd3c78947031 (diff) | |
| download | chromium_src-629494519869e2e9b0f06f3a459acc7805e90e25.zip chromium_src-629494519869e2e9b0f06f3a459acc7805e90e25.tar.gz chromium_src-629494519869e2e9b0f06f3a459acc7805e90e25.tar.bz2 | |
Try to fix broken tree
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/breakpad_mac.h | 4 | ||||
| -rw-r--r-- | chrome/app/breakpad_mac.mm | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/chrome/app/breakpad_mac.h b/chrome/app/breakpad_mac.h index 9c48752..8872191 100644 --- a/chrome/app/breakpad_mac.h +++ b/chrome/app/breakpad_mac.h @@ -5,6 +5,8 @@ #ifndef CHROME_APP_BREAKPAD_MAC_H_ #define CHROME_APP_BREAKPAD_MAC_H_ +extern "C" { + // This header defines the Chrome entry points for Breakpad integration. // Initializes Breakpad. @@ -34,4 +36,6 @@ void ClearCrashKeyValue(NSString* key); #endif // __OBJC__ +} + #endif // CHROME_APP_BREAKPAD_MAC_H_ diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 6d28d47..87c8fe3 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -15,10 +15,10 @@ #import "breakpad/src/client/mac/Framework/Breakpad.h" #include "chrome/installer/util/google_update_settings.h" -#if !defined(GOOGLE_CHROME_BUILD) - extern "C" { +#if !defined(GOOGLE_CHROME_BUILD) + // If we aren't compiling as a branded build, then add dummy versions of the // Breakpad functions so we don't have to link against Breakpad. @@ -40,8 +40,6 @@ void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key) { NOTREACHED(); } -} - #endif // !defined(GOOGLE_CHROME_BUILD) namespace { @@ -151,3 +149,6 @@ void ClearCrashKeyValue(NSString* key) { BreakpadRemoveUploadParameter(gBreakpadRef, key); } + +} + |