diff options
| author | badea@adobe.com <badea@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 16:33:55 +0000 |
|---|---|---|
| committer | badea@adobe.com <badea@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 16:33:55 +0000 |
| commit | 3cb68f7b12b1c3f1508427d72bd68c3b5f8febf4 (patch) | |
| tree | c93d8a912c8b1688022674b7b92924119a4cb3e1 /third_party/mozilla | |
| parent | a27384c8ab1d1c350a4d93c9bfc4775653130e01 (diff) | |
| download | chromium_src-3cb68f7b12b1c3f1508427d72bd68c3b5f8febf4.zip chromium_src-3cb68f7b12b1c3f1508427d72bd68c3b5f8febf4.tar.gz chromium_src-3cb68f7b12b1c3f1508427d72bd68c3b5f8febf4.tar.bz2 | |
chrome/browser should build on the x86_64 architecture.
BUG=143395
TEST=32/64-bit chrome/browser builds without errors.
TBR=mac64
Review URL: https://chromiumcodereview.appspot.com/10825447
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mozilla')
| -rw-r--r-- | third_party/mozilla/NSWorkspace+Utils.m | 4 | ||||
| -rw-r--r-- | third_party/mozilla/README.chromium | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/mozilla/NSWorkspace+Utils.m b/third_party/mozilla/NSWorkspace+Utils.m index e3d052c..157f1d0 100644 --- a/third_party/mozilla/NSWorkspace+Utils.m +++ b/third_party/mozilla/NSWorkspace+Utils.m @@ -164,10 +164,10 @@ // + (long)systemVersion { - static long sSystemVersion = 0; + static SInt32 sSystemVersion = 0; if (!sSystemVersion) Gestalt(gestaltSystemVersion, &sSystemVersion); - return sSystemVersion; + return (long)sSystemVersion; } // diff --git a/third_party/mozilla/README.chromium b/third_party/mozilla/README.chromium index 46a1c2b..e8027f7 100644 --- a/third_party/mozilla/README.chromium +++ b/third_party/mozilla/README.chromium @@ -23,6 +23,7 @@ Local modifications: -[NSPasteboard getURLs:andTitles:] to determine whether or not filenames in the drag should be converted to file URLs. -[NSPasteboard htmlFromRtf] added to do rtf->html conversion. +- NSWorkspace+Utils.m was modified to compile on the x86_64 architecture. ----------------------------------------------------------------- |