Bodgy support around including X11/Xos_r.h

Undefine index and rindex first to prevent clashes with tt funcs.

Should be fixed by namespacing local funcs

diff --git a/cde/lib/tt/lib/util/tt_host_equiv.C b/cde/lib/tt/lib/util/tt_host_equiv.C
index 0aec31e1250d8e407fc79c9590a208b23e057c65..fba3bdcb8e29c0a64bcfc81fd994493557f4fcbf 100644 (file)
--- a/cde/lib/tt/lib/util/tt_host_equiv.C
+++ b/cde/lib/tt/lib/util/tt_host_equiv.C
@@ -36,8 +36,15 @@
 
 #define X_INCLUDE_NETDB_H
 #define XOS_USE_XT_LOCKING
+#if defined(linux)
+#define index
+#define rindex
+#endif
 #include <X11/Xos_r.h>
-
+#if defined(linux)
+#undef index
+#undef rindex
+#endif
 static int _cache_it(_Tt_hostname_cache_ptr, _Tt_string &);
 
 // This null constructor is required by the _table_of macro:

diff --git a/cde/lib/tt/lib/util/tt_path.C b/cde/lib/tt/lib/util/tt_path.C
index b6e354d46739bcc5475983cdff700ee356f22274..8dd9f2bbd60970b95bf867eceea0d4f2945e63af 100644 (file)
--- a/cde/lib/tt/lib/util/tt_path.C
+++ b/cde/lib/tt/lib/util/tt_path.C
@@ -49,7 +49,15 @@
 /* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
 #define X_INCLUDE_DIRENT_H
 #define XOS_USE_NO_LOCKING
+#if defined(linux)
+#define index
+#define rindex
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#undef index
+#undef rindex
+#endif
 
 #if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
 #define S_ISLNK(mode)   ((mode & 0xF000) == S_IFLNK)

diff --git a/cde/lib/tt/lib/util/tt_string_map.C b/cde/lib/tt/lib/util/tt_string_map.C
index 2eb4cc61bf8e636d9a939fce62b6627f66dc4a19..0c219c77845323716f88b4fa2899d3aba3e385dd 100644 (file)
--- a/cde/lib/tt/lib/util/tt_string_map.C
+++ b/cde/lib/tt/lib/util/tt_string_map.C
@@ -45,7 +45,15 @@
 /* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING
+#if defined(linux)
+#define index
+#define rindex
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#undef index
+#undef rindex
+#endif
 
 _Tt_string_map::
 _Tt_string_map (_Tt_object_table_keyfn key_function)