os: xtrans: drop FS_t
Not defined anywhere, so no need to keep it around anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
6a2f1e7bdb
commit
70981fffb0
15
os/Xtrans.c
15
os/Xtrans.c
|
@ -342,21 +342,6 @@ TRANS(ParseAddress) (const char *address,
|
||||||
|
|
||||||
_port = mybuf;
|
_port = mybuf;
|
||||||
|
|
||||||
#if defined(FS_t)
|
|
||||||
/*
|
|
||||||
* Is there an optional catalogue list?
|
|
||||||
*/
|
|
||||||
|
|
||||||
if ((mybuf = strchr (mybuf,'/')) != NULL)
|
|
||||||
*mybuf ++= '\0';
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The rest, if any, is the (currently unused) catalogue list.
|
|
||||||
*
|
|
||||||
* _catalogue = mybuf;
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
|
|
||||||
done_parsing:
|
done_parsing:
|
||||||
/*
|
/*
|
||||||
* Now that we have all of the components, allocate new
|
* Now that we have all of the components, allocate new
|
||||||
|
|
|
@ -90,13 +90,6 @@ static const char *__xtransname = "_XimTrans";
|
||||||
#endif
|
#endif
|
||||||
#endif /* XIM_t */
|
#endif /* XIM_t */
|
||||||
|
|
||||||
#ifdef FS_t
|
|
||||||
#define TRANS(func) _FSTrans##func
|
|
||||||
#ifdef XTRANSDEBUG
|
|
||||||
static const char *__xtransname = "_FSTrans";
|
|
||||||
#endif
|
|
||||||
#endif /* FS_t */
|
|
||||||
|
|
||||||
#if !defined(TRANS)
|
#if !defined(TRANS)
|
||||||
#define TRANS(func) _XTrans##func
|
#define TRANS(func) _XTrans##func
|
||||||
#ifdef XTRANSDEBUG
|
#ifdef XTRANSDEBUG
|
||||||
|
|
|
@ -223,9 +223,6 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr,
|
||||||
#if defined(XIM_t)
|
#if defined(XIM_t)
|
||||||
#define NAMEDNODENAME "/tmp/.XIM-pipe/XIM"
|
#define NAMEDNODENAME "/tmp/.XIM-pipe/XIM"
|
||||||
#endif
|
#endif
|
||||||
#if defined(FS_t)
|
|
||||||
#define NAMEDNODENAME "/tmp/.font-pipe/fs"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef LOCAL_TRANS_NAMED
|
#ifdef LOCAL_TRANS_NAMED
|
||||||
|
|
|
@ -238,10 +238,6 @@ is_numeric (const char *str)
|
||||||
#define UNIX_PATH "/tmp/.XIM-unix/XIM"
|
#define UNIX_PATH "/tmp/.XIM-unix/XIM"
|
||||||
#define UNIX_DIR "/tmp/.XIM-unix"
|
#define UNIX_DIR "/tmp/.XIM-unix"
|
||||||
#endif /* XIM_t */
|
#endif /* XIM_t */
|
||||||
#if defined(FS_t)
|
|
||||||
#define UNIX_PATH "/tmp/.font-unix/fs"
|
|
||||||
#define UNIX_DIR "/tmp/.font-unix"
|
|
||||||
#endif /* FS_t */
|
|
||||||
|
|
||||||
#endif /* UNIXCONN */
|
#endif /* UNIXCONN */
|
||||||
|
|
||||||
|
@ -400,7 +396,7 @@ TRANS(SocketOpen) (int i, int type)
|
||||||
Sockettrans2devtab[i].protocol);
|
Sockettrans2devtab[i].protocol);
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#if (defined(X11_t) && !defined(USE_POLL)) || defined(FS_t)
|
#if (defined(X11_t) && !defined(USE_POLL))
|
||||||
if (ciptr->fd >= sysconf(_SC_OPEN_MAX))
|
if (ciptr->fd >= sysconf(_SC_OPEN_MAX))
|
||||||
{
|
{
|
||||||
prmsg (2, "SocketOpen: socket() returned out of range fd %d\n",
|
prmsg (2, "SocketOpen: socket() returned out of range fd %d\n",
|
||||||
|
|
Loading…
Reference in New Issue