From 33165fe0d5c265c92f2a67fc2b437b567c24e294 Mon Sep 17 00:00:00 2001
From: "liujisi@google.com"
 <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Tue, 2 Nov 2010 13:14:58 +0000
Subject: Submit recent changes from internal branch. See CHANGES.txt for more
 details.

---
 src/google/protobuf/compiler/subprocess.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/compiler/subprocess.cc')

diff --git a/src/google/protobuf/compiler/subprocess.cc b/src/google/protobuf/compiler/subprocess.cc
index dbd813e1..5fb5d5cb 100644
--- a/src/google/protobuf/compiler/subprocess.cc
+++ b/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>
-- 
cgit v1.2.3