shared

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;
 

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

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"