From f9f1cf1323062c4062b42f3196a0b42c4b6cc8b9 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 14 Nov 2012 15:36:22 +0000 Subject: Update protobuf by cherry-picking upstream r430: Update protobuf for 64-bit compatibility on Mac OS X. The system's routines from 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 --- third_party/protobuf/README.chromium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/protobuf/README.chromium') 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. -- cgit v1.1