From 0f669a6799c96efd184986a9b0985f9968a5ad24 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 17 Apr 2020 16:17:52 +0200
Subject: [PATCH] shared

---
 src/utils/pathut.cpp   | 5 ++++-
 src/utils/pxattr.cpp   | 2 +-
 src/utils/readfile.cpp | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/utils/pathut.cpp b/src/utils/pathut.cpp
index 46b0f80b..d8244bdc 100644
--- a/src/utils/pathut.cpp
+++ b/src/utils/pathut.cpp
@@ -110,8 +110,11 @@
 
 #include "pathut.h"
 #include "smallut.h"
+#ifdef MDU_INCLUDE_LOG
+#include MDU_INCLUDE_LOG
+#else
 #include "log.h"
-
+#endif
 
 using namespace std;
 
diff --git a/src/utils/pxattr.cpp b/src/utils/pxattr.cpp
index 9c4aaa98..d191ab10 100644
--- a/src/utils/pxattr.cpp
+++ b/src/utils/pxattr.cpp
@@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 // PXALINUX: platforms like kfreebsd which aren't linux but use the
 // same xattr interface
-#if defined(__gnu_linux__) || \
+#if defined(__linux__) || \
     (defined(__FreeBSD_kernel__)&&defined(__GLIBC__)&&!defined(__FreeBSD__)) ||\
     defined(__CYGWIN__)
 #define PXALINUX
diff --git a/src/utils/readfile.cpp b/src/utils/readfile.cpp
index 0f90d117..326737d5 100644
--- a/src/utils/readfile.cpp
+++ b/src/utils/readfile.cpp
@@ -18,6 +18,9 @@
 #include "autoconfig.h"
 #else
 #include "config.h"
+#ifndef PRETEND_USE
+#define PRETEND_USE(expr) ((void)(expr))
+#endif
 #endif
 
 #include "readfile.h"