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

missing header error.
2012-03-11 16:14:04 +00:00
parent bcfc468cdc
commit b2b6d0d386
2 changed files with 13 additions and 0 deletions
--- 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>

--- 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 *);