diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2017-06-20 22:53:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 22:53:22 -0700 |
| commit | 8ecae34ac65218e9fda1586abc39f8762dbb40de (patch) | |
| tree | f5ebd70dd889b94872f0e4fe75704d21998dd4cd /php/ext/google/protobuf/def.c | |
| parent | bf04c83267619b618e7112b242f424f8b3e785b6 (diff) | |
| parent | 3b1a87518cead7403b8e13c41945e41a30d602e4 (diff) | |
| download | protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.tar.gz protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.tar.bz2 protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.zip | |
Merge pull request #3255 from TeBoring/3.3.x-3
Cherry-pick bug fixes for php
Diffstat (limited to 'php/ext/google/protobuf/def.c')
| -rw-r--r-- | php/ext/google/protobuf/def.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/php/ext/google/protobuf/def.c b/php/ext/google/protobuf/def.c index 8e563a61..099ebd05 100644 --- a/php/ext/google/protobuf/def.c +++ b/php/ext/google/protobuf/def.c @@ -30,8 +30,8 @@ #include "protobuf.h" -const char* const kReservedNames[] = {"Empty"}; -const int kReservedNamesSize = 1; +const char* const kReservedNames[] = {"Empty", "ECHO", "ARRAY"}; +const int kReservedNamesSize = 3; // Forward declare. static void descriptor_init_c_instance(Descriptor* intern TSRMLS_DC); |