From b6b2635eda2a54b55e4d030647f5bb9c1af99727 Mon Sep 17 00:00:00 2001
From: Christopher Dykes <cdykes@fb.com>
Date: Mon, 30 May 2016 16:05:16 -0700
Subject: [PATCH] Include <folly/portability/Fcntl.h> where needed

Summary: Diff #9 of 14.

Reviewed By: mzlee

Differential Revision: D3262436

fbshipit-source-id: 60c5df03e91163c651bc6e5e0d38ba8b46b8c723
---
 folly/File.cpp                       | 2 +-
 folly/FileUtil.cpp                   | 4 +---
 folly/io/async/AsyncServerSocket.cpp | 2 +-
 folly/io/async/AsyncSocket.cpp       | 2 +-
 folly/io/async/AsyncUDPSocket.cpp    | 2 +-
 folly/io/async/NotificationQueue.h   | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/folly/File.cpp b/folly/File.cpp
index 091e0103..ad0b4475 100644
--- 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 e73b5936..9d50e82a 100644
--- 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 2693cc8a..f28bbc31 100644
--- 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 3d9f91c7..3424eb98 100644
--- 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 34723caf..d7e9f03b 100644
--- 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 2a12980e..86a2b95b 100644
--- 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>
 
-- 
2.34.1