diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 15:36:22 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 15:36:22 +0000 |
| commit | f9f1cf1323062c4062b42f3196a0b42c4b6cc8b9 (patch) | |
| tree | 4a2f3a30a331c986d7b199955c94532eb67268bc /third_party/protobuf/README.chromium | |
| parent | e7bff3e6d0f7849fb0066caa8341e95c73efa631 (diff) | |
| download | chromium_src-f9f1cf1323062c4062b42f3196a0b42c4b6cc8b9.zip chromium_src-f9f1cf1323062c4062b42f3196a0b42c4b6cc8b9.tar.gz chromium_src-f9f1cf1323062c4062b42f3196a0b42c4b6cc8b9.tar.bz2 | |
Update protobuf by cherry-picking upstream r430:
Update protobuf for 64-bit compatibility on Mac OS X.
The system's routines from <libkern/OSAtomic.h> use int64_t as their 64-bit
type. int64_t is a typedef for long long. Google's atomicops.h routines use
Atomic64 as their 64-bit type. Atomic64 is a typedef for intptr_t, which is
in turn a typedef for long. It isn't possible to cast from long* to long long*
with const_cast, reinterpret_cast is needed. This change fixes this problem
the same way Chrome fixed it in https://codereview.chromium.org/6091007 .
protobuf r423 renamed GOOGLE_PROTOBUF_HOST_ARCH_64_BIT to
GOOGLE_PROTOBUF_ARCH_64_BIT, but the change was not made in
atomicops_internals_atomicword_compat.h.
Review URL: https://codereview.chromium.org/11293276
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/README.chromium')
| -rw-r--r-- | third_party/protobuf/README.chromium | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 51c2fdc..38b9936 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -19,7 +19,7 @@ A protobuf.gyp file has been added for building with Chromium. This code has been patched to support unknown field retention in protobuf-lite. See r62331 for the patch. -Revision r427 was cherry-picked from upstream. +Revisions r427 and r430 were cherry-picked from upstream. Cherry-pick patch from http://code.google.com/p/protobuf/issues/detail?id=425. |