external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Bodgy support around including X11/Xos_r.h

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

Should be fixed by namespacing local funcs
This commit is contained in:
Peter Howkins 2012-03-11 23:44:52 +00:00
parent c3dc5b47a1
commit b672c0782a
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cde/lib/tt/lib/util/tt_host_equiv.C
View file

@ -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:

8
cde/lib/tt/lib/util/tt_path.C
View file

@ -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)

8
cde/lib/tt/lib/util/tt_string_map.C
View file

@ -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)