|
Roll Protobuf r415:r423.
1) Got an upstream diff 415:423 from svn
2) Applied
3) Updated protobuf.gyp
Changelog:
r423 Add support for NaCl in atomicops.
r422 Fix issue/333. skip any escaped characters in quotes.
r421 -lz in protobuf.pc belongs in Libs.private, not Libs
r420 set _VARDADIC_MAX=10 preprocessor definition to make test pass in vc11.
r419 Allow configure to disable maintainer mode
r418 Update atomicops to support new platforms where intptr_t = long.
r417 Fix a NULL/bool conversion.
r416 Fix issue 378
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148557
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+273 lines, -551 lines) |
Patch |
 |
M |
third_party/protobuf/README.chromium
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/protobuf.gyp
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/Makefile.am
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/descriptor.pb.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops.h
|
View
|
|
4 chunks |
+53 lines, -30 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h
|
View
|
|
1 chunk |
+10 lines, -7 lines |
0 comments
|
Download
|
 |
A |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
|
View
|
|
1 chunk |
+122 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h
|
View
|
|
3 chunks |
+13 lines, -93 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h
|
View
|
|
1 chunk |
+10 lines, -7 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h
|
View
|
|
1 chunk |
+10 lines, -7 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
D |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_macosx.h
|
View
|
|
1 chunk |
+0 lines, -304 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h
|
View
|
|
1 chunk |
+10 lines, -7 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
|
View
|
|
1 chunk |
+10 lines, -7 lines |
0 comments
|
Download
|
 |
M |
third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
|
View
|
|
2 chunks |
+24 lines, -82 lines |
0 comments
|
Download
|
Total messages: 6 (0 generated)
|