Rename field names in command_server.proto so that they don't conflict with C symbols.

Fixed #1155.

--
MOS_MIGRATED_REVID=120107746

3 files changed, 10 insertions, 8 deletions

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 0d45f2f934..ebb56e867d 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -1840,12 +1840,14 @@ void GrpcBlazeServer::Communicate() {
   std::unique_ptr<grpc::ClientReader<command_server::RunResponse>> reader(
       client->Run(&context, request));
   while (reader->Read(&response)) {
-    if (response.stdout().size() > 0) {
-      write(1, response.stdout().c_str(), response.stdout().size());
+    if (response.standard_output().size() > 0) {
+      write(1, response.standard_output().c_str(),
+            response.standard_output().size());
     }
 
-    if (response.stderr().size() > 0) {
-      write(2, response.stderr().c_str(), response.stderr().size());
+    if (response.standard_error().size() > 0) {
+      write(2, response.standard_error().c_str(),
+            response.standard_error().size());
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
index cd387362b9..4349d83062 100644
--- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
@@ -81,8 +81,8 @@ public class GrpcServerImpl implements CommandServerGrpc.CommandServer, GrpcServ
           .setCookie(responseCookie);
 
       switch (type) {
-        case STDOUT: response.setStdout(input); break;
-        case STDERR: response.setStderr(input); break;
+        case STDOUT: response.setStandardOutput(input); break;
+        case STDERR: response.setStandardError(input); break;
         default: throw new IllegalStateException();
       }
 
diff --git a/src/main/protobuf/command_server.proto b/src/main/protobuf/command_server.proto
index 8055610c08..244d3966a3 100644
--- a/src/main/protobuf/command_server.proto
+++ b/src/main/protobuf/command_server.proto
@@ -32,8 +32,8 @@ message RunResponse {
   // The server always sets this to the response cookie from the output base. A rudimentary form
   // of authentication.
   string cookie = 1;
-  bytes stdout = 2;
-  bytes stderr = 3;
+  bytes standard_output = 2;
+  bytes standard_error = 3;
   bool finished = 4;    // Whether this is the last message of the stream
   int32 exit_code = 5;  // Only valid for the last message in the stream
 }