diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | BUILD | 3 | ||||
| -rw-r--r-- | php/ext/google/protobuf/message.c | 1 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/java/java_options.h | 4 |
4 files changed, 7 insertions, 4 deletions
@@ -167,3 +167,6 @@ js/google/ js/node_modules/ js/testproto_libs1.js js/testproto_libs2.js + +# Ignore the bazel symlinks +/bazel-* @@ -600,7 +600,7 @@ java_library( ]) + [ ":gen_well_known_protos_java", ], - javacopts = ["-source 6"], + javacopts = ["-source 6", "-target 6"], visibility = ["//visibility:public"], ) @@ -609,6 +609,7 @@ java_library( srcs = glob([ "java/util/src/main/java/com/google/protobuf/util/*.java", ]), + javacopts = ["-source 6", "-target 6"], visibility = ["//visibility:public"], deps = [ "protobuf_java", diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index cabc3987..79a2739a 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -30,7 +30,6 @@ #include <php.h> #include <stdlib.h> -#include <ext/json/php_json.h> #include "protobuf.h" diff --git a/src/google/protobuf/compiler/java/java_options.h b/src/google/protobuf/compiler/java/java_options.h index 7bce1447..e4e7d5e2 100644 --- a/src/google/protobuf/compiler/java/java_options.h +++ b/src/google/protobuf/compiler/java/java_options.h @@ -59,10 +59,10 @@ struct Options { bool annotate_code; // Name of a file where we will write a list of generated .meta file names, // one per line. - string annotation_list_file; + std::string annotation_list_file; // Name of a file where we will write a list of generated file names, one // per line. - string output_list_file; + std::string output_list_file; }; } // namespace java |