third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m ('k') | third_party/protobuf/patches/0005-fix-include-js-generator.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch

diff --git a/third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch b/third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch

index 419ca0df1ba4142c02cb58797758f226a4f81286..084555332f3d60b7520813be04ef98f5ae446ac1 100644

--- a/third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch

+++ b/third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch

@@ -46,15 +46,39 @@

#define LIBPROTOBUF_EXPORT

#define LIBPROTOC_EXPORT

#endif

-@@ -149,9 +149,9 @@

+@@ -109,15 +125,15 @@

+ typedef unsigned __int32 uint32;

+ typedef unsigned __int64 uint64;

+ #else

+-typedef signed char int8;

+-typedef short int16;

+-typedef int int32;

+-typedef long long int64;

+-typedef unsigned char uint8;

+-typedef unsigned short uint16;

+-typedef unsigned int uint32;

+-typedef unsigned long long uint64;

++typedef int8_t int8;

++typedef int16_t int16;

++typedef int32_t int32;

++typedef int64_t int64;

++typedef uint8_t uint8;

++typedef uint16_t uint16;

++typedef uint32_t uint32;

++typedef uint64_t uint64;

+ #endif

+ // long long macros to be used because gcc and vc++ use different suffixes,

+@@ -131,8 +147,8 @@

+ #define GOOGLE_ULONGLONG(x) x##UI64

#define GOOGLE_LL_FORMAT "I64" // As in printf("%I64d", ...)

#else

- // By long long, we actually mean int64.

-#define GOOGLE_LONGLONG(x) x##LL

-#define GOOGLE_ULONGLONG(x) x##ULL

+#define GOOGLE_LONGLONG(x) INT64_C(x)

+#define GOOGLE_ULONGLONG(x) UINT64_C(x)

- // Used to format real long long integers.

#define GOOGLE_LL_FORMAT "ll" // As in "%lld". Note that "q" is poor form also.

#endif