From: Peter Howkins <flibble@users.sourceforge.net>
Date: Sun, 11 Mar 2012 16:14:04 +0000 (+0000)
Subject: Undefine SVR4 whilst including #include <X11/Xos_r.h> to prevent sys/byteorder.h
X-Git-Tag: 2.2.0a~26^2~154
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2b6d0d38677e7d248b3f0950a10b5b67949926b;p=oweals%2Fcde.git

Undefine SVR4 whilst including #include <X11/Xos_r.h> to prevent sys/byteorder.h
missing header error.
---

diff --git a/cde/lib/csa/debug.c b/cde/lib/csa/debug.c
index 07ce1814..0a313146 100644
--- a/cde/lib/csa/debug.c
+++ b/cde/lib/csa/debug.c
@@ -32,7 +32,14 @@
 
 #define X_INCLUDE_TIME_H
 #define XOS_USE_NO_LOCKING
+
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#define SVR4
+#endif
 
 #include <syslog.h>
 
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 99657aca..a5faff9f 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -41,7 +41,13 @@
 #endif
 #define X_INCLUDE_PWD_H
 #define XOS_USE_XT_LOCKING
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#define SVR4
+#endif
 
 extern char * strdup(const char *);