Switch uses of <unistd.h> to <folly/portability/Unistd.h>

Summary: Diff #12 of 14. Reviewed By: mzlee Differential Revision: D3187000 fbshipit-source-id: ad56ca8ff20fa88949554b61545ee1bf982b0569
facebook · May 30, 2016 · 97b1736 · 97b1736
1 parent b8f1474
commit 97b1736
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 25 deletions.
diff --git a/thrift/lib/cpp/concurrency/FunctionRunner.h b/thrift/lib/cpp/concurrency/FunctionRunner.h
@@ -17,8 +17,8 @@
 #ifndef _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H
 #define _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H 1
 
-#include <unistd.h>
 #include <folly/Function.h>
+#include <folly/portability/Unistd.h>
 #include <thrift/lib/cpp/concurrency/Monitor.h>
 #include <thrift/lib/cpp/concurrency/Thread.h>
 

diff --git a/thrift/lib/cpp/concurrency/ThreadManager.h b/thrift/lib/cpp/concurrency/ThreadManager.h
@@ -18,7 +18,6 @@
 #define _THRIFT_CONCURRENCY_THREADMANAGER_H_ 1
 
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <array>
 #include <functional>
@@ -29,7 +28,7 @@
 #include <folly/LifoSem.h>
 #include <folly/RWSpinLock.h>
 #include <folly/portability/GFlags.h>
-
+#include <folly/portability/Unistd.h>
 #include <wangle/concurrent/Codel.h>
 
 #include <thrift/lib/cpp/concurrency/FunctionRunner.h>

diff --git a/thrift/lib/cpp/concurrency/test/ThreadFactoryTests.h b/thrift/lib/cpp/concurrency/test/ThreadFactoryTests.h
@@ -22,9 +22,9 @@
 #include <thrift/lib/cpp/concurrency/PosixThreadFactory.h>
 #include <thrift/lib/cpp/concurrency/Monitor.h>
 #include <thrift/lib/cpp/concurrency/Util.h>
+#include <folly/portability/Unistd.h>
 
 #include <assert.h>
-#include <unistd.h>
 #include <iostream>
 #include <set>
 

diff --git a/thrift/lib/cpp/server/TServer.cpp b/thrift/lib/cpp/server/TServer.cpp
@@ -19,10 +19,9 @@
 
 #include <thrift/lib/cpp/server/TServer.h>
 
-#include <unistd.h>
-
 #include <folly/portability/SysResource.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 namespace apache { namespace thrift { namespace server {
 

diff --git a/thrift/lib/cpp/test/loadgen/IntervalTimer.h b/thrift/lib/cpp/test/loadgen/IntervalTimer.h
@@ -23,7 +23,7 @@
 #include <thrift/lib/cpp/concurrency/Mutex.h>
 #include <thrift/lib/cpp/TLogging.h>
 
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 namespace apache { namespace thrift { namespace loadgen {
 

diff --git a/thrift/lib/cpp/test/loadgen/TerminalMonitor.cpp b/thrift/lib/cpp/test/loadgen/TerminalMonitor.cpp
@@ -18,7 +18,8 @@
  */
 #include <thrift/lib/cpp/test/loadgen/TerminalMonitor.h>
 
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
+
 #include <sys/ioctl.h>
 
 namespace apache { namespace thrift { namespace loadgen {

diff --git a/thrift/lib/cpp/transport/TFDTransport.cpp b/thrift/lib/cpp/transport/TFDTransport.cpp
@@ -22,7 +22,7 @@
 #include <cerrno>
 #include <exception>
 
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 using namespace std;
 

diff --git a/thrift/lib/cpp/transport/TFileTransport.cpp b/thrift/lib/cpp/transport/TFileTransport.cpp
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <unistd.h>
 #ifdef THRIFT_HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -37,6 +36,7 @@
 #include <sys/stat.h>
 
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 namespace apache { namespace thrift { namespace transport {
 

diff --git a/thrift/lib/cpp/transport/THeader.h b/thrift/lib/cpp/transport/THeader.h
@@ -22,12 +22,12 @@
 #include <vector>
 
 #include <folly/Optional.h>
+#include <folly/portability/Unistd.h>
 #include <thrift/lib/cpp/protocol/TProtocolTypes.h>
 #include <thrift/lib/cpp/concurrency/Thread.h>
 
 #include <bitset>
 #include <pwd.h>
-#include <unistd.h>
 #include <chrono>
 
 // Don't include the unknown client.

diff --git a/thrift/lib/cpp/transport/THeaderTransport.h b/thrift/lib/cpp/transport/THeaderTransport.h
@@ -32,11 +32,11 @@
 
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufQueue.h>
+#include <folly/portability/Unistd.h>
 
 #include <bitset>
 #include <boost/scoped_array.hpp>
 #include <pwd.h>
-#include <unistd.h>
 
 namespace apache { namespace thrift { namespace transport {
 

diff --git a/thrift/lib/cpp/transport/TServerSocket.cpp b/thrift/lib/cpp/transport/TServerSocket.cpp
@@ -26,10 +26,12 @@
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include <thrift/lib/cpp/transport/TSocket.h>
 #include <thrift/lib/cpp/util/FdUtils.h>
+
+#include <folly/portability/Unistd.h>
+
 #include <memory>
 
 namespace apache { namespace thrift { namespace transport {

diff --git a/thrift/lib/cpp/transport/TSocket.cpp b/thrift/lib/cpp/transport/TSocket.cpp
@@ -27,12 +27,13 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
-#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 
 #include <thrift/lib/cpp/transport/TTransportException.h>
 
+#include <folly/portability/Unistd.h>
+
 namespace apache { namespace thrift { namespace transport {
 
 using namespace std;

diff --git a/thrift/lib/cpp/transport/test/TSSLSocketTest.cpp b/thrift/lib/cpp/transport/test/TSSLSocketTest.cpp
@@ -26,6 +26,7 @@
 #include <folly/SocketAddress.h>
 #include <thrift/lib/cpp/transport/TRpcTransport.h>
 #include <thrift/lib/cpp/TProcessor.h>
+#include <folly/portability/Unistd.h>
 
 #include <fcntl.h>
 #include <gtest/gtest.h>
@@ -34,7 +35,6 @@
 #include <poll.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 using std::string;
 using std::vector;

diff --git a/thrift/lib/cpp/transport/test/TransportTest.cpp b/thrift/lib/cpp/transport/test/TransportTest.cpp
@@ -23,7 +23,7 @@
 
 #include <thrift/lib/cpp/transport/TMemPagedTransport.tcc>
 
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 using std::cout;
 using std::cerr;

diff --git a/thrift/perf/cpp/AsyncLoadHandler.cpp b/thrift/perf/cpp/AsyncLoadHandler.cpp
@@ -19,11 +19,10 @@
 #include <thrift/perf/cpp/AsyncLoadHandler.h>
 
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/Unistd.h>
 #include <thrift/lib/cpp/async/TEventServer.h>
 #include <thrift/lib/cpp/concurrency/Util.h>
 
-#include <unistd.h>
-
 using folly::EventBase;
 using apache::thrift::concurrency::Util;
 

diff --git a/thrift/perf/cpp/AsyncLoadHandler2.cpp b/thrift/perf/cpp/AsyncLoadHandler2.cpp
@@ -19,10 +19,9 @@
 #include <thrift/perf/cpp/AsyncLoadHandler2.h>
 
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/Unistd.h>
 #include <thrift/lib/cpp/concurrency/Util.h>
 
-#include <unistd.h>
-
 using folly::EventBase;
 using apache::thrift::concurrency::Util;
 

diff --git a/thrift/perf/cpp/LoadHandler.cpp b/thrift/perf/cpp/LoadHandler.cpp
@@ -20,7 +20,7 @@
 
 #include <thrift/lib/cpp/concurrency/Util.h>
 
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 using apache::thrift::concurrency::Util;
 

diff --git a/thrift/test/RWMutexStarveTest.cpp b/thrift/test/RWMutexStarveTest.cpp
@@ -18,14 +18,15 @@
  */
 
 #include <iostream>
-#include <unistd.h>
 
 #include <atomic>
 #include <memory>
 
 #include <thrift/lib/cpp/concurrency/Mutex.h>
 #include <thrift/lib/cpp/concurrency/PosixThreadFactory.h>
 
+#include <folly/portability/Unistd.h>
+
 #include <gtest/gtest.h>
 
 using namespace std;

diff --git a/thrift/test/THeaderTest.cpp b/thrift/test/THeaderTest.cpp
@@ -17,7 +17,6 @@
 #include <memory>
 #include <stdio.h>
 #include <iostream>
-#include <unistd.h>
 
 #include <thrift/lib/cpp/async/TEventServer.h>
 #include <thrift/lib/cpp/async/TSyncToAsyncProcessor.h>
@@ -47,6 +46,7 @@
 #include <thrift/test/gen-cpp/Service.h>
 
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 #include <gtest/gtest.h>
 

diff --git a/thrift/test/TransportTest.cpp b/thrift/test/TransportTest.cpp
@@ -21,9 +21,9 @@
 #include <cstdlib>
 #include <ctime>
 #include <functional>
-#include <unistd.h>
 #include <folly/Conv.h>
 #include <folly/experimental/TestUtil.h>
+#include <folly/portability/Unistd.h>
 
 #include <thrift/lib/cpp/transport/TBufferTransports.h>
 #include <thrift/lib/cpp/transport/TFDTransport.h>

diff --git a/thrift/test/cpp/src/TestClient.cpp b/thrift/test/cpp/src/TestClient.cpp
@@ -19,7 +19,6 @@
 
 #define __STDC_FORMAT_MACROS
 #include <stdio.h>
-#include <unistd.h>
 #include <thrift/lib/cpp/protocol/TBinaryProtocol.h>
 #include <thrift/lib/cpp/protocol/THeaderProtocol.h>
 #include <thrift/lib/cpp/transport/TTransportUtils.h>
@@ -30,6 +29,7 @@
 #include <thrift/test/gen-cpp/ThriftTest.h>
 
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 #include <inttypes.h>