From 9d0798dbfb09be8098ce51afa52a18dddb814ece Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Fri, 7 Apr 2017 00:12:57 -0400
Subject: [PATCH] restructure fadvise

---
 src/{fs_fadvise.cpp => fs_base_fadvise.cpp}                   | 4 ++--
 src/{fs_fadvise.hpp => fs_base_fadvise.hpp}                   | 0
 src/{fs_fadvise_posix.icpp => fs_base_fadvise_posix.icpp}     | 2 ++
 ...vise_unsupported.icpp => fs_base_fadvise_unsupported.icpp} | 0
 src/fs_clonefile.cpp                                          | 2 +-
 src/release.cpp                                               | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename src/{fs_fadvise.cpp => fs_base_fadvise.cpp} (91%)
 rename src/{fs_fadvise.hpp => fs_base_fadvise.hpp} (100%)
 rename src/{fs_fadvise_posix.icpp => fs_base_fadvise_posix.icpp} (98%)
 rename src/{fs_fadvise_unsupported.icpp => fs_base_fadvise_unsupported.icpp} (100%)

diff --git a/src/fs_fadvise.cpp b/src/fs_base_fadvise.cpp
similarity index 91%
rename from src/fs_fadvise.cpp
rename to src/fs_base_fadvise.cpp
index e0ddb265..e276d8ff 100644
--- a/src/fs_fadvise.cpp
+++ b/src/fs_base_fadvise.cpp
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 
 #if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
-# include "fs_fadvise_posix.icpp"
+# include "fs_base_fadvise_posix.icpp"
 #else
-# include "fs_fadvise_unsupported.icpp"
+# include "fs_base_fadvise_unsupported.icpp"
 #endif
diff --git a/src/fs_fadvise.hpp b/src/fs_base_fadvise.hpp
similarity index 100%
rename from src/fs_fadvise.hpp
rename to src/fs_base_fadvise.hpp
diff --git a/src/fs_fadvise_posix.icpp b/src/fs_base_fadvise_posix.icpp
similarity index 98%
rename from src/fs_fadvise_posix.icpp
rename to src/fs_base_fadvise_posix.icpp
index 66ae3daa..1475285d 100644
--- a/src/fs_fadvise_posix.icpp
+++ b/src/fs_base_fadvise_posix.icpp
@@ -14,6 +14,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <fcntl.h>
+
 #include "errno.hpp"
 
 namespace fs
diff --git a/src/fs_fadvise_unsupported.icpp b/src/fs_base_fadvise_unsupported.icpp
similarity index 100%
rename from src/fs_fadvise_unsupported.icpp
rename to src/fs_base_fadvise_unsupported.icpp
diff --git a/src/fs_clonefile.cpp b/src/fs_clonefile.cpp
index 7628f42a..ca33b607 100644
--- a/src/fs_clonefile.cpp
+++ b/src/fs_clonefile.cpp
@@ -25,6 +25,7 @@
 #include "fs_base_chmod.hpp"
 #include "fs_base_chown.hpp"
 #include "fs_base_close.hpp"
+#include "fs_base_fadvise.hpp"
 #include "fs_base_fallocate.hpp"
 #include "fs_base_lseek.hpp"
 #include "fs_base_mkdir.hpp"
@@ -33,7 +34,6 @@
 #include "fs_base_stat.hpp"
 #include "fs_base_utime.hpp"
 #include "fs_base_write.hpp"
-#include "fs_fadvise.hpp"
 #include "fs_sendfile.hpp"
 #include "fs_xattr.hpp"
 
diff --git a/src/release.cpp b/src/release.cpp
index 5b045f44..63cf3fc2 100644
--- a/src/release.cpp
+++ b/src/release.cpp
@@ -22,7 +22,7 @@
 #include "errno.hpp"
 #include "fileinfo.hpp"
 #include "fs_base_close.hpp"
-#include "fs_fadvise.hpp"
+#include "fs_base_fadvise.hpp"
 
 static
 int