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 d181d8064be37a7e5ce1c274c755988585bca6df..ef59551c35aa642d2e0f3fea76f1664159bb16de 100644 (file)
--- 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 4b74ff3e68b3ff8fc71e4c7c0dce91e85855a30c..1706c6af1930ea8b71c64e1b93c332c814fbae84 100644 (file)
--- 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 f2acbed9c3200316d043b80e960079e1a1776832..1a8f5cb9613386f9e0f2e2be1c2cacdfdf40d310 100644 (file)
--- 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__ << ": "