Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months 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/src/google/protobuf/compiler/subprocess.h ('k') | third_party/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
diff --git a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
index dbd813e11433677d696ac67054ba2a8ce15a76d5..5fb5d5cb7d7680e7ac80f0e31b9fb6cc244902b2 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
@@ -32,6 +32,8 @@
#include <google/protobuf/compiler/subprocess.h>
+#include <algorithm>
+
#ifndef _WIN32
#include <errno.h>
#include <sys/select.h>
@@ -39,7 +41,6 @@
#include <signal.h>
#endif
-#include <algorithm>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/message.h>
#include <google/protobuf/stubs/substitute.h>
« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/subprocess.h ('k') | third_party/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698