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
This commit is contained in:
@@ -36,8 +36,15 @@
|
|||||||
|
|
||||||
#define X_INCLUDE_NETDB_H
|
#define X_INCLUDE_NETDB_H
|
||||||
#define XOS_USE_XT_LOCKING
|
#define XOS_USE_XT_LOCKING
|
||||||
|
#if defined(linux)
|
||||||
|
#define index
|
||||||
|
#define rindex
|
||||||
|
#endif
|
||||||
#include <X11/Xos_r.h>
|
#include <X11/Xos_r.h>
|
||||||
|
#if defined(linux)
|
||||||
|
#undef index
|
||||||
|
#undef rindex
|
||||||
|
#endif
|
||||||
static int _cache_it(_Tt_hostname_cache_ptr, _Tt_string &);
|
static int _cache_it(_Tt_hostname_cache_ptr, _Tt_string &);
|
||||||
|
|
||||||
// This null constructor is required by the _table_of macro:
|
// This null constructor is required by the _table_of macro:
|
||||||
|
|||||||
@@ -49,7 +49,15 @@
|
|||||||
/* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
|
/* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
|
||||||
#define X_INCLUDE_DIRENT_H
|
#define X_INCLUDE_DIRENT_H
|
||||||
#define XOS_USE_NO_LOCKING
|
#define XOS_USE_NO_LOCKING
|
||||||
|
#if defined(linux)
|
||||||
|
#define index
|
||||||
|
#define rindex
|
||||||
|
#endif
|
||||||
#include <X11/Xos_r.h>
|
#include <X11/Xos_r.h>
|
||||||
|
#if defined(linux)
|
||||||
|
#undef index
|
||||||
|
#undef rindex
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
|
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
|
||||||
#define S_ISLNK(mode) ((mode & 0xF000) == S_IFLNK)
|
#define S_ISLNK(mode) ((mode & 0xF000) == S_IFLNK)
|
||||||
|
|||||||
@@ -45,7 +45,15 @@
|
|||||||
/* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
|
/* Included after "util/tt_string.h" to avoid index/strchr conflicts. */
|
||||||
#define X_INCLUDE_STRING_H
|
#define X_INCLUDE_STRING_H
|
||||||
#define XOS_USE_NO_LOCKING
|
#define XOS_USE_NO_LOCKING
|
||||||
|
#if defined(linux)
|
||||||
|
#define index
|
||||||
|
#define rindex
|
||||||
|
#endif
|
||||||
#include <X11/Xos_r.h>
|
#include <X11/Xos_r.h>
|
||||||
|
#if defined(linux)
|
||||||
|
#undef index
|
||||||
|
#undef rindex
|
||||||
|
#endif
|
||||||
|
|
||||||
_Tt_string_map::
|
_Tt_string_map::
|
||||||
_Tt_string_map (_Tt_object_table_keyfn key_function)
|
_Tt_string_map (_Tt_object_table_keyfn key_function)
|
||||||
|
|||||||
Reference in New Issue
Block a user