Merge remote-tracking branch 'origin/master' into cmake_support

c20a32e8 · zhujiashun · 8eed253d · d0e9df6e · c20a32e8
Commit c20a32e8 authored Dec 12, 2017 by zhujiashun
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

popen.cpp src/butil/popen.cpp +3 -0

No files found.
--- a/src/butil/popen.cpp
+++ b/src/butil/popen.cpp
@@ -29,9 +29,12 @@
 extern "C" {
 uint64_t BAIDU_WEAK bthread_usleep(uint64_t microseconds);
 }
+#endif

 namespace butil {

+#if defined(OS_LINUX)
+
 const int CHILD_STACK_SIZE = 256 * 1024;

 struct ChildArgs {