Include <folly/portability/Fcntl.h> where needed

Summary: Diff #9 of 14.

Reviewed By: mzlee

Differential Revision: D3262436

fbshipit-source-id: 60c5df03e91163c651bc6e5e0d38ba8b46b8c723

diff --git a/folly/File.cpp b/folly/File.cpp
index 091e0103e901067887615fceea3804f7843fb82a..ad0b44754f0af5ac9f9723fcffffe0c80a419273 100644 (file)
--- a/folly/File.cpp
+++ b/folly/File.cpp
@@ -16,13 +16,13 @@
 
 #include <folly/File.h>
 
-#include <fcntl.h>
 #include <unistd.h>
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
 #include <folly/Format.h>
 #include <folly/ScopeGuard.h>
+#include <folly/portability/Fcntl.h>
 #include <folly/portability/SysFile.h>
 
 #include <system_error>

diff --git a/folly/FileUtil.cpp b/folly/FileUtil.cpp
index e73b593602a7a42c2e1e62bb1fdf5eb9147310ef..9d50e82ada00692c36750a071d59745d82de07da 100644 (file)
--- a/folly/FileUtil.cpp
+++ b/folly/FileUtil.cpp
@@ -17,12 +17,10 @@
 #include <folly/FileUtil.h>
 
 #include <cerrno>
-#ifdef __APPLE__
-#include <fcntl.h>
-#endif
 #include <sys/socket.h>
 
 #include <folly/detail/FileUtilDetail.h>
+#include <folly/portability/Fcntl.h>
 #include <folly/portability/SysFile.h>
 
 namespace folly {

diff --git a/folly/io/async/AsyncServerSocket.cpp b/folly/io/async/AsyncServerSocket.cpp
index 2693cc8a7199e3956edc88e966416d685d09414c..f28bbc31f0044589abfb19152d0add62183470ad 100644 (file)
--- a/folly/io/async/AsyncServerSocket.cpp
+++ b/folly/io/async/AsyncServerSocket.cpp
@@ -25,9 +25,9 @@
 #include <folly/detail/SocketFastOpen.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/NotificationQueue.h>
+#include <folly/portability/Fcntl.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <netinet/tcp.h>
 #include <string.h>
 #include <sys/socket.h>

diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
index 3d9f91c7889862a4b562a678127ef6941e3ba93b..3424eb98188907305707159b9581bb02530b3bf5 100644 (file)
--- a/folly/io/async/AsyncSocket.cpp
+++ b/folly/io/async/AsyncSocket.cpp
@@ -20,6 +20,7 @@
 #include <folly/io/async/EventHandler.h>
 #include <folly/SocketAddress.h>
 #include <folly/io/IOBuf.h>
+#include <folly/portability/Fcntl.h>
 #include <folly/portability/SysUio.h>
 
 #include <poll.h>
@@ -27,7 +28,6 @@
 #include <limits.h>
 #include <unistd.h>
 #include <thread>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index 34723caf77cd4d54754ef5684e4a8a9261b446ca..d7e9f03b85bb869c1196f65b3067f09a96655b9e 100644 (file)
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -18,10 +18,10 @@
 
 #include <folly/io/async/EventBase.h>
 #include <folly/Likely.h>
+#include <folly/portability/Fcntl.h>
 
 #include <errno.h>
 #include <unistd.h>
-#include <fcntl.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/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index 2a12980ead4f8c169b5b5bf5777964488c22ba7b..86a2b95b85861bae9ad7f2de9a6b5c6dbbbdd3be 100644 (file)
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -36,6 +35,7 @@
 #include <folly/Likely.h>
 #include <folly/ScopeGuard.h>
 #include <folly/SpinLock.h>
+#include <folly/portability/Fcntl.h>
 
 #include <glog/logging.h>