From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sun, 26 Nov 2017 01:17:40 +0000 (+1300)
Subject: Fix compile errors on GNU/Hurd (#82)
X-Git-Tag: SQUID_4_0_22~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e81c1c54d1be3d9b7d49a2b1d9e8efd8f997b31;p=thirdparty%2Fsquid.git

Fix compile errors on GNU/Hurd (#82)

LOCK_UN definition in base/File.h require sys/file.h.
---

diff --git a/src/base/File.cc b/src/base/File.cc
index d181d8064b..ef59551c35 100644
--- a/src/base/File.cc
+++ b/src/base/File.cc
@@ -18,9 +18,6 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#if HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
diff --git a/src/base/File.h b/src/base/File.h
index 4b74ff3e68..1706c6af19 100644
--- a/src/base/File.h
+++ b/src/base/File.h
@@ -11,6 +11,10 @@
 
 #include "sbuf/SBuf.h"
 
+#if HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 /// How should a file be opened/created? Should it be locked?
 class FileOpeningConfig
 {
diff --git a/src/security/cert_generators/file/certificate_db.cc b/src/security/cert_generators/file/certificate_db.cc
index f2acbed9c3..1a8f5cb961 100644
--- a/src/security/cert_generators/file/certificate_db.cc
+++ b/src/security/cert_generators/file/certificate_db.cc
@@ -17,12 +17,12 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#if HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
+#if HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
 
 #define HERE "(security_file_certgen) " << __FILE__ << ':' << __LINE__ << ": "