From 97b1736ac759c349cd43de2ac912c8cba2daf753 Mon Sep 17 00:00:00 2001
From: Christopher Dykes <cdykes@fb.com>
Date: Mon, 30 May 2016 16:05:19 -0700
Subject: [PATCH] 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
---
 thrift/lib/cpp/concurrency/FunctionRunner.h          | 2 +-
 thrift/lib/cpp/concurrency/ThreadManager.h           | 3 +--
 thrift/lib/cpp/concurrency/test/ThreadFactoryTests.h | 2 +-
 thrift/lib/cpp/server/TServer.cpp                    | 3 +--
 thrift/lib/cpp/test/loadgen/IntervalTimer.h          | 2 +-
 thrift/lib/cpp/test/loadgen/TerminalMonitor.cpp      | 3 ++-
 thrift/lib/cpp/transport/TFDTransport.cpp            | 2 +-
 thrift/lib/cpp/transport/TFileTransport.cpp          | 2 +-
 thrift/lib/cpp/transport/THeader.h                   | 2 +-
 thrift/lib/cpp/transport/THeaderTransport.h          | 2 +-
 thrift/lib/cpp/transport/TServerSocket.cpp           | 4 +++-
 thrift/lib/cpp/transport/TSocket.cpp                 | 3 ++-
 thrift/lib/cpp/transport/test/TSSLSocketTest.cpp     | 2 +-
 thrift/lib/cpp/transport/test/TransportTest.cpp      | 2 +-
 thrift/perf/cpp/AsyncLoadHandler.cpp                 | 3 +--
 thrift/perf/cpp/AsyncLoadHandler2.cpp                | 3 +--
 thrift/perf/cpp/LoadHandler.cpp                      | 2 +-
 thrift/test/RWMutexStarveTest.cpp                    | 3 ++-
 thrift/test/THeaderTest.cpp                          | 2 +-
 thrift/test/TransportTest.cpp                        | 2 +-
 thrift/test/cpp/src/TestClient.cpp                   | 2 +-
 21 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/thrift/lib/cpp/concurrency/FunctionRunner.h b/thrift/lib/cpp/concurrency/FunctionRunner.h
index aaec235ae09..2889ee6744c 100644
--- 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
index 4ed9d7858f9..2159632e0ec 100644
--- 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
index 9b85c4b038f..2909a45b9c7 100644
--- 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
index 14e45925391..79276547271 100644
--- 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
index b4149d251c4..f4d336ae789 100644
--- 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
index b518c5b1189..cdab16e3a4b 100644
--- 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
index a8868f499bc..d1de11b1f97 100644
--- 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
index 9ea8784769c..f7857551ca9 100644
--- 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
index 3e82d4dcbef..9c5f469802a 100644
--- 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
index 7ccf57de911..730f554f764 100644
--- 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
index c1747e9cc09..a5bffeba417 100644
--- 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
index be8b5cf6446..369f5234a34 100644
--- 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
index 6b7ec6881e4..ddd5c5758f2 100644
--- 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
index 3bdf5c469db..b119b4c8ee6 100644
--- 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
index 28ea979ba67..ab0ecbaf8cc 100644
--- 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
index e946c65ba74..7486db7c223 100644
--- 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
index b08a3a4271d..c6253c027c0 100644
--- 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
index 7c011e94461..1887fec1633 100644
--- a/thrift/test/RWMutexStarveTest.cpp
+++ b/thrift/test/RWMutexStarveTest.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <iostream>
-#include <unistd.h>
 
 #include <atomic>
 #include <memory>
@@ -26,6 +25,8 @@
 #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
index 4096f6d51e5..fb49e018aab 100644
--- 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
index 8f0a94bfe40..7ff3ea97105 100644
--- 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
index d8d5c88cb50..46eba623351 100644
--- 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>