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 07ce1814dcc38256581d7805b8033ad34e239a08..0a31314672268ec352ba240431a2e85385c3bd8b 100644 (file)
--- 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 99657aca244efa4647ee60c442da882478277f57..a5faff9fc3c13249494f198b1cbd57dd5cf88c0d 100644 (file)
--- 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 *);