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

diff --git a/folly/AtomicUnorderedMap.h b/folly/AtomicUnorderedMap.h
index 34cdf8598a0d7b35214623e649f873fbd231d61f..5dc5d88f6aa0899bbfd40b1229ae75cea37c62d6 100644 (file)
--- a/folly/AtomicUnorderedMap.h
+++ b/folly/AtomicUnorderedMap.h
@@ -22,7 +22,6 @@
 #include <system_error>
 #include <type_traits>
 #include <stdint.h>
-#include <unistd.h>
 
 #include <folly/Bits.h>
 #include <folly/Conv.h>
@@ -30,6 +29,7 @@
 #include <folly/Random.h>
 #include <folly/detail/AtomicUnorderedMapUtils.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <boost/type_traits/has_trivial_destructor.hpp>
 #include <limits>

diff --git a/folly/File.cpp b/folly/File.cpp
index ad0b44754f0af5ac9f9723fcffffe0c80a419273..744c0d39fe0f95e92e64d87c4701de4c6c08cd51 100644 (file)
--- a/folly/File.cpp
+++ b/folly/File.cpp
@@ -16,7 +16,6 @@
 
 #include <folly/File.h>
 
-#include <unistd.h>
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
@@ -24,6 +23,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/SysFile.h>
+#include <folly/portability/Unistd.h>
 
 #include <system_error>
 

diff --git a/folly/File.h b/folly/File.h
index 09a3b6bf4e087f9a0f53e6faef8bb2ec70528011..26d158e11f9b1fb5dca80ce228f24211077ad05e 100644 (file)
--- a/folly/File.h
+++ b/folly/File.h
@@ -19,12 +19,12 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <string>
 
 #include <folly/Portability.h>
 #include <folly/Range.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index de250aefdd0f997dcf6af01f9a1b48d0c4a64c6c..704a4969fc58d1cfff8780b13bf63a85d35a663d 100644 (file)
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -20,13 +20,13 @@
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 #include <cassert>
 #include <limits>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 namespace folly {
 

diff --git a/folly/IndexedMemPool.h b/folly/IndexedMemPool.h
index 1007eff9ec803061c07b7fb97020a41174db1589..bf35b559162e074b7b7ff7ba4e4e7daeb02712c5 100644 (file)
--- a/folly/IndexedMemPool.h
+++ b/folly/IndexedMemPool.h
@@ -19,11 +19,11 @@
 #include <type_traits>
 #include <stdint.h>
 #include <assert.h>
-#include <unistd.h>
 #include <boost/noncopyable.hpp>
 #include <folly/AtomicStruct.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 #pragma GCC diagnostic push

diff --git a/folly/MPMCQueue.h b/folly/MPMCQueue.h
index 66b76886a44554bc7f9149be9f8ce4939066cb84..08b2e1b8f7e31cd86b9881c30311fcb1fe08ed7f 100644 (file)
--- a/folly/MPMCQueue.h
+++ b/folly/MPMCQueue.h
@@ -23,11 +23,11 @@
 #include <limits>
 #include <string.h>
 #include <type_traits>
-#include <unistd.h>
 
 #include <folly/Traits.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/detail/TurnSequencer.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/Random.cpp b/folly/Random.cpp
index f27092f218c09c81fbbbd7ffaea9a8637571d522..c6b611be181346d5b489851b710f5af22a24a5f2 100644 (file)
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -17,7 +17,6 @@
 #include <folly/Random.h>
 
 #include <atomic>
-#include <unistd.h>
 #include <mutex>
 #include <random>
 #include <array>
@@ -28,6 +27,7 @@
 #include <folly/FileUtil.h>
 #include <folly/ThreadLocal.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 #ifdef _MSC_VER
 # include <wincrypt.h>

diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index ad2c077dcc9d2729d4337ed5f3a5a5c4fbc8ba89..c208de51eac8b53ec9cc680cd478edaccd513282 100644 (file)
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -26,8 +26,6 @@
 #include <fcntl.h>
 #include <poll.h>
 
-#include <unistd.h>
-
 #include <array>
 #include <algorithm>
 #include <system_error>
@@ -43,6 +41,7 @@
 #include <folly/String.h>
 #include <folly/io/Cursor.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Unistd.h>
 
 constexpr int kExecFailure = 127;
 constexpr int kChildFailure = 126;

diff --git a/folly/detail/AtomicUnorderedMapUtils.h b/folly/detail/AtomicUnorderedMapUtils.h
index 4142ade82ff7675983c7ea91a7bec8d7de4ef1b4..53aba01f44a9252510997a42b6f66e274b4da4ad 100644 (file)
--- a/folly/detail/AtomicUnorderedMapUtils.h
+++ b/folly/detail/AtomicUnorderedMapUtils.h
@@ -2,9 +2,9 @@
 
 #include <atomic>
 #include <stdint.h>
-#include <unistd.h>
 
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly { namespace detail {
 

diff --git a/folly/detail/FileUtilDetail.h b/folly/detail/FileUtilDetail.h
index b5ae6f65ed0ef3131df477de0735b570af30706e..bcebc5fc08f82b111c5a1be84c0e1295da0b1e53 100644 (file)
--- a/folly/detail/FileUtilDetail.h
+++ b/folly/detail/FileUtilDetail.h
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <cerrno>
-#include <unistd.h>
 
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 /**
  * Helper functions and templates for FileUtil.cpp.  Declared here so

diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index 2f9e848707e160e98d5137289028c6ae26589431..019ce79a9d233bc9414c667de151d06eab72f06f 100644 (file)
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -20,9 +20,10 @@
 #include <chrono>
 #include <limits>
 #include <assert.h>
-#include <unistd.h>
 #include <boost/noncopyable.hpp>
 
+#include <folly/portability/Unistd.h>
+
 namespace folly { namespace detail {
 
 enum class FutexResult {

diff --git a/folly/detail/MemoryIdler.cpp b/folly/detail/MemoryIdler.cpp
index bb6b6e44d2cd8b08ba5ef49725b63378f0f03f08..4c63054d442623d77175b5cadbf0167ffba2d668 100644 (file)
--- a/folly/detail/MemoryIdler.cpp
+++ b/folly/detail/MemoryIdler.cpp
@@ -22,12 +22,12 @@
 #include <folly/ScopeGuard.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <limits.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <utility>
 
 namespace folly { namespace detail {

diff --git a/folly/detail/TurnSequencer.h b/folly/detail/TurnSequencer.h
index 6c62928b08b4b1d262fff8af972ed9f72424fa3f..193b40b0d8139517e46f65cd7bf25b03403c2fee 100644 (file)
--- a/folly/detail/TurnSequencer.h
+++ b/folly/detail/TurnSequencer.h
@@ -19,10 +19,10 @@
 #include <algorithm>
 #include <assert.h>
 #include <limits>
-#include <unistd.h>
 
 #include <folly/detail/Futex.h>
 #include <folly/portability/Asm.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/experimental/EventCount.h b/folly/experimental/EventCount.h
index e45be5a52d84a6f1833efc122b0dfcbe32d0e311..a9feddfd83f8228320be48c305d596957e9d62fc 100644 (file)
--- a/folly/experimental/EventCount.h
+++ b/folly/experimental/EventCount.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <unistd.h>
 #include <syscall.h>
 #include <linux/futex.h>
 #include <climits>
@@ -27,6 +26,7 @@
 #include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 
 namespace folly {

diff --git a/folly/experimental/LockFreeRingBuffer.h b/folly/experimental/LockFreeRingBuffer.h
index 5411112d0f7bf37c6b50ef963c1319c5a24533a6..5ca4a7d20cd88bf0104566116d4cdb5b1d5eea3b 100644 (file)
--- a/folly/experimental/LockFreeRingBuffer.h
+++ b/folly/experimental/LockFreeRingBuffer.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string.h>
 #include <type_traits>
-#include <unistd.h>
 
 #include <folly/detail/TurnSequencer.h>
 #include <folly/Portability.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace detail {

diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index 7087c5684377280d922317f1ea5f84e0fc7ae3e5..dc58798271bd5748909d3c23bef5874c3bb6c2a9 100644 (file)
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include <boost/regex.hpp>
 #include <folly/Conv.h>
@@ -29,6 +28,7 @@
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace test {

diff --git a/folly/experimental/io/AsyncIO.cpp b/folly/experimental/io/AsyncIO.cpp
index d9539340e901809f0a6ac17dbd65feff51176c19..7095d84909b1a0d5bb10f140a23c40323e88e2a1 100644 (file)
--- a/folly/experimental/io/AsyncIO.cpp
+++ b/folly/experimental/io/AsyncIO.cpp
@@ -17,7 +17,6 @@
 #include <folly/experimental/io/AsyncIO.h>
 
 #include <sys/eventfd.h>
-#include <unistd.h>
 #include <cerrno>
 #include <ostream>
 #include <stdexcept>
@@ -30,6 +29,7 @@
 #include <folly/Format.h>
 #include <folly/Likely.h>
 #include <folly/String.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/experimental/io/FsUtil.cpp b/folly/experimental/io/FsUtil.cpp
index 7c385bdc4f8aed92fe7419a67822b90d1c7277b9..c6f75fb58c67da0f143014c839533fa81f0d4a0f 100644 (file)
--- a/folly/experimental/io/FsUtil.cpp
+++ b/folly/experimental/io/FsUtil.cpp
@@ -16,8 +16,8 @@
 
 #include <folly/experimental/io/FsUtil.h>
 
-#include <unistd.h>
 #include <folly/Exception.h>
+#include <folly/portability/Unistd.h>
 
 namespace bsys = ::boost::system;
 

diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index 0eea9252f9eb46a83581bec73120005449b255ff..09f3c07397e9aa7068a5daa8b1710e193a668829 100644 (file)
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -19,7 +19,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include <iostream>
 #include <stdexcept>
@@ -33,6 +32,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/HugePages.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_bool(cp, false, "Copy file");
 

diff --git a/folly/experimental/io/HugePages.h b/folly/experimental/io/HugePages.h
index 8d5619a2b62a5c0fa0d89277f1b05e7d10e4e5cc..04984c8e142629157a79745b54d4f771d17b4b70 100644 (file)
--- a/folly/experimental/io/HugePages.h
+++ b/folly/experimental/io/HugePages.h
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <cstddef>
 #include <string>
-#include <unistd.h>
 #include <utility>
 #include <vector>
 
@@ -28,6 +27,7 @@
 
 #include <folly/Range.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/fibers/Fiber.cpp b/folly/fibers/Fiber.cpp
index 20af545569d35e0e102bad782f512e7a41f19c58..ea33b6bff3dec1dcf0470e13d7568c9e5acb4ce6 100644 (file)
--- a/folly/fibers/Fiber.cpp
+++ b/folly/fibers/Fiber.cpp
@@ -15,8 +15,6 @@
  */
 #include "Fiber.h"
 
-#include <unistd.h>
-
 #include <glog/logging.h>
 #include <algorithm>
 #include <cstring>
@@ -27,6 +25,7 @@
 #include <folly/fibers/BoostContextCompatibility.h>
 #include <folly/fibers/FiberManager.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace fibers {

diff --git a/folly/fibers/FiberManager.cpp b/folly/fibers/FiberManager.cpp
index de552a54f0871cf9e859d6b361fc1a6da85a3780..99280e82e7f7f1e5d7194b0232a7466be7974608 100644 (file)
--- a/folly/fibers/FiberManager.cpp
+++ b/folly/fibers/FiberManager.cpp
@@ -16,7 +16,6 @@
 #include "FiberManager.h"
 
 #include <signal.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <stdexcept>
@@ -28,6 +27,7 @@
 
 #include <folly/SingletonThreadLocal.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 #ifdef FOLLY_SANITIZE_ADDRESS
 

diff --git a/folly/fibers/GuardPageAllocator.cpp b/folly/fibers/GuardPageAllocator.cpp
index b424e6f729e016f242465468197b309387751b4d..80bdbd755c7628edbe5ddaaafe950d71c51c73cc 100644 (file)
--- a/folly/fibers/GuardPageAllocator.cpp
+++ b/folly/fibers/GuardPageAllocator.cpp
@@ -15,13 +15,12 @@
  */
 #include "GuardPageAllocator.h"
 
-#include <unistd.h>
-
 #include <mutex>
 
 #include <folly/Singleton.h>
 #include <folly/SpinLock.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <glog/logging.h>
 

diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index 8414370ca22fa7f1f69ba5701220afb5193def63..18fca468e2ce7a56252316f8c1cee4c36b868b21 100644 (file)
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -22,6 +22,7 @@
 #include <folly/Executor.h>
 #include <folly/dynamic.h>
 #include <folly/Baton.h>
+#include <folly/portability/Unistd.h>
 
 #include <algorithm>
 #include <atomic>
@@ -30,7 +31,6 @@
 #include <string>
 #include <thread>
 #include <type_traits>
-#include <unistd.h>
 
 using namespace folly;
 

diff --git a/folly/futures/test/TimekeeperTest.cpp b/folly/futures/test/TimekeeperTest.cpp
index b64a56369a09de3482ec18c1492f81efd3e8982c..c20668c08a5ea444bc287622141f54c5c75b13ef 100644 (file)
--- a/folly/futures/test/TimekeeperTest.cpp
+++ b/folly/futures/test/TimekeeperTest.cpp
@@ -17,8 +17,7 @@
 #include <gtest/gtest.h>
 
 #include <folly/futures/Timekeeper.h>
-
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 using std::chrono::milliseconds;

diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 86f3a9f294b62b2bf83866260a47d65bed21f301..027fe9f0dd1217871a460d0735c41b68a13952c1 100644 (file)
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
 #include <atomic>
 #include <algorithm>
 #include <thread>
@@ -23,6 +22,7 @@
 #include <folly/Benchmark.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/ParallelMap.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly::gen;
 

diff --git a/folly/io/RecordIO.cpp b/folly/io/RecordIO.cpp
index d889e80698aac8098a710e0c5eed6f0aeed6d3cf..f279ae47e79863d17120f6259f6a0a78db755000 100644 (file)
--- a/folly/io/RecordIO.cpp
+++ b/folly/io/RecordIO.cpp
@@ -17,7 +17,6 @@
 #include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
@@ -25,6 +24,7 @@
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 

diff --git a/folly/io/async/AsyncSSLSocket.cpp b/folly/io/async/AsyncSSLSocket.cpp
index 2146d6b9b6a19d8af3104c19350a8d434836cec4..c972c87764a2884b3a8b84cd197686e13393f2ee 100644 (file)
--- a/folly/io/async/AsyncSSLSocket.cpp
+++ b/folly/io/async/AsyncSSLSocket.cpp
@@ -28,7 +28,6 @@
 #include <openssl/ssl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <unistd.h>
 #include <chrono>
 
 #include <folly/Bits.h>
@@ -36,6 +35,7 @@
 #include <folly/SpinLock.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/Cursor.h>
+#include <folly/portability/Unistd.h>
 
 using folly::SocketAddress;
 using folly::SSLContext;

diff --git a/folly/io/async/AsyncServerSocket.cpp b/folly/io/async/AsyncServerSocket.cpp
index f28bbc31f0044589abfb19152d0add62183470ad..5d15ff4905cd16ddab052b3bab658ee3ac2c3142 100644 (file)
--- a/folly/io/async/AsyncServerSocket.cpp
+++ b/folly/io/async/AsyncServerSocket.cpp
@@ -26,13 +26,13 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/NotificationQueue.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <errno.h>
 #include <netinet/tcp.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 namespace folly {
 

diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
index 3424eb98188907305707159b9581bb02530b3bf5..c35d7b473a6a026e6cfe1d5b6dd090709b543273 100644 (file)
--- a/folly/io/async/AsyncSocket.cpp
+++ b/folly/io/async/AsyncSocket.cpp
@@ -22,11 +22,11 @@
 #include <folly/io/IOBuf.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 #include <poll.h>
 #include <errno.h>
 #include <limits.h>
-#include <unistd.h>
 #include <thread>
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index d7e9f03b85bb869c1196f65b3067f09a96655b9e..236e60e6df0394141ca2c47d47b4ae9d2e8ae9d6 100644 (file)
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -19,9 +19,9 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/Likely.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <errno.h>
-#include <unistd.h>
 
 // Due to the way kernel headers are included, this may or may not be defined.
 // Number pulled from 3.10 kernel headers.

diff --git a/folly/io/async/EventBase.cpp b/folly/io/async/EventBase.cpp
index 0987f1fac282cce125b41c7bea482e58666b9f37..2680d96cd90fb5d4368753fa28689f726cebff1e 100644 (file)
--- a/folly/io/async/EventBase.cpp
+++ b/folly/io/async/EventBase.cpp
@@ -22,12 +22,12 @@
 
 #include <folly/ThreadName.h>
 #include <folly/io/async/NotificationQueue.h>
+#include <folly/portability/Unistd.h>
 
 #include <condition_variable>
 #include <fcntl.h>
 #include <mutex>
 #include <pthread.h>
-#include <unistd.h>
 
 namespace {
 

diff --git a/folly/io/async/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index 86a2b95b85861bae9ad7f2de9a6b5c6dbbbdd3be..0f26d88d51a13546f61d21bbce11af247370344f 100644 (file)
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -18,7 +18,6 @@
 
 #include <poll.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <algorithm>
 #include <deque>
@@ -36,6 +35,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/SpinLock.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <glog/logging.h>
 

diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp
index e946d6e6348f0c3498723f7eb5faae922e10c046..2e5f246213fa7b4bf8351e6ee00b6b173628a7bb 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest.cpp
@@ -21,6 +21,7 @@
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/SocketAddress.h>
+#include <folly/portability/Unistd.h>
 
 #include <folly/io/async/test/BlockingSocket.h>
 
@@ -29,7 +30,6 @@
 #include <iostream>
 #include <list>
 #include <set>
-#include <unistd.h>
 #include <fcntl.h>
 #include <openssl/bio.h>
 #include <poll.h>

diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h
index 69966d6743955e125237fc4106b997869241c1a8..5c0fe43704543d46a7c9da598bb13b2df4f8ebbc 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.h
+++ b/folly/io/async/test/AsyncSSLSocketTest.h
@@ -27,11 +27,11 @@
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ssl/SSLErrors.h>
+#include <folly/portability/Unistd.h>
 
 #include <gtest/gtest.h>
 #include <iostream>
 #include <list>
-#include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>

diff --git a/folly/io/async/test/AsyncSocketTest2.cpp b/folly/io/async/test/AsyncSocketTest2.cpp
index 4f9bd3a2c1447930972fee045b09f3fb18eb5fbc..927d74f7d3b35dfac42ebe17bff4745078e0eec1 100644 (file)
--- a/folly/io/async/test/AsyncSocketTest2.cpp
+++ b/folly/io/async/test/AsyncSocketTest2.cpp
@@ -24,12 +24,12 @@
 #include <folly/io/IOBuf.h>
 #include <folly/io/async/test/AsyncSocketTest.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/Unistd.h>
 #include <folly/test/SocketAddressTestHelper.h>
 
 #include <gtest/gtest.h>
 #include <boost/scoped_array.hpp>
 #include <iostream>
-#include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>

diff --git a/folly/io/async/test/EventBaseTest.cpp b/folly/io/async/test/EventBaseTest.cpp
index 46840882122045acfb8f5e0de176c4ae96a552f1..bc8988abb1ff5787c7251d1168f0bbceb53fe5ce 100644 (file)
--- a/folly/io/async/test/EventBaseTest.cpp
+++ b/folly/io/async/test/EventBaseTest.cpp
@@ -23,10 +23,10 @@
 #include <folly/io/async/EventHandler.h>
 #include <folly/io/async/test/SocketPair.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/Unistd.h>
 
 #include <atomic>
 #include <iostream>
-#include <unistd.h>
 #include <memory>
 #include <thread>
 

diff --git a/folly/io/async/test/SocketPair.cpp b/folly/io/async/test/SocketPair.cpp
index 73df89b7829e8a804a5bbe94758a7d6094c6f390..eff35d762818ad13cc86293e64ed5addcb68466e 100644 (file)
--- a/folly/io/async/test/SocketPair.cpp
+++ b/folly/io/async/test/SocketPair.cpp
@@ -19,8 +19,8 @@
 #include <folly/io/async/test/SocketPair.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/Unistd.h>
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>

diff --git a/folly/io/async/test/TimeUtil.cpp b/folly/io/async/test/TimeUtil.cpp
index 006c9ca644b466b49bba2aec296c7927e2ad1cbe..8103fcc5c3790358a7c6f5b1b1f4bbc78e0695b3 100644 (file)
--- a/folly/io/async/test/TimeUtil.cpp
+++ b/folly/io/async/test/TimeUtil.cpp
@@ -21,6 +21,7 @@
 
 #include <folly/Conv.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 #include <chrono>
 #include <sys/types.h>
@@ -29,7 +30,6 @@
 #include <errno.h>
 #include <glog/logging.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdexcept>
 

diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index e18fd2625abcaac508171c7e2d273c2d02baa09e..9154b8ac9111880d7d323a4d0b646199ea34b631 100644 (file)
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
-#include <unistd.h>
+
 #include <random>
 
 #include <glog/logging.h>
@@ -29,6 +29,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 

diff --git a/folly/test/IndexedMemPoolTest.cpp b/folly/test/IndexedMemPoolTest.cpp
index 5c7a9733d297b8e0ba4526ebaf4de845bbf24368..91c248055d3a3e0d581a5f7d69c9ae75144010d8 100644 (file)
--- a/folly/test/IndexedMemPoolTest.cpp
+++ b/folly/test/IndexedMemPoolTest.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/IndexedMemPool.h>
 #include <folly/test/DeterministicSchedule.h>
+#include <folly/portability/Unistd.h>
 #include <string>
 #include <thread>
-#include <unistd.h>
 #include <semaphore.h>
 #include <gtest/gtest.h>
 

diff --git a/folly/test/MPMCQueueTest.cpp b/folly/test/MPMCQueueTest.cpp
index 93c7d3d51283ed27fa2534ae0bfdcaba82e322bc..25b85a92a4ebff668c6743a5a942155b683f40ce 100644 (file)
--- a/folly/test/MPMCQueueTest.cpp
+++ b/folly/test/MPMCQueueTest.cpp
@@ -19,6 +19,7 @@
 #include <folly/Memory.h>
 #include <folly/portability/SysResource.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 #include <folly/test/DeterministicSchedule.h>
 
 #include <boost/intrusive_ptr.hpp>
@@ -26,7 +27,6 @@
 #include <functional>
 #include <thread>
 #include <utility>
-#include <unistd.h>
 
 #include <gtest/gtest.h>
 

diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 18011e1ab80e763617665de383a2c8182ca31659..a6a40415b4c00a3e5fdc777980a7068ef7a1a88d 100644 (file)
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -21,7 +21,6 @@
 #include <folly/RWSpinLock.h>
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <vector>
 #include <thread>
 
@@ -29,6 +28,7 @@
 #include <gtest/gtest.h>
 
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_int32(num_threads, 8, "num threads");
 

diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp
index 0b0bb9ae4eddf6481c0af18d9c65079ab4171b4b..e91dd3a8bb31ee921f8423a2a15ef263c5c66199 100644 (file)
--- a/folly/test/SubprocessTest.cpp
+++ b/folly/test/SubprocessTest.cpp
@@ -16,7 +16,6 @@
 
 #include <folly/Subprocess.h>
 
-#include <unistd.h>
 #include <sys/types.h>
 
 #include <boost/container/flat_set.hpp>
@@ -33,6 +32,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/Dirent.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 

diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index 7ade0795c9445acda4dbea711210bd900619e723..68a601d937e55b662c542dceebf7fb536fec3eca 100644 (file)
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -26,13 +26,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <unistd.h>
 
 #include <glog/logging.h>
 
 #include <folly/Conv.h>
 #include <folly/Subprocess.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 using folly::Subprocess;
 

diff --git a/folly/test/ThreadLocalBenchmark.cpp b/folly/test/ThreadLocalBenchmark.cpp
index 6009cc6a955b375858651a5da141e3d9340ea6d1..a3ea1e537551f40937b4b3e085b1cd5a9d1a53b1 100644 (file)
--- a/folly/test/ThreadLocalBenchmark.cpp
+++ b/folly/test/ThreadLocalBenchmark.cpp
@@ -19,7 +19,6 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #include <array>
 #include <atomic>
@@ -38,6 +37,7 @@
 #include <folly/Benchmark.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 

diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index f9cd3f3f1404ba362fcdf9438dc76e2bd7d27fd4..230aaa3340119da0348712248465b8d7e8f1d5d0 100644 (file)
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -19,7 +19,6 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #include <array>
 #include <atomic>
@@ -38,6 +37,7 @@
 #include <folly/Baton.h>
 #include <folly/Memory.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;