diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-29 13:33:51 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:11:42 +0200 |
commit | 00ebfaf535801a8600ac48319b43b9c28e5f6749 (patch) | |
tree | c06d91c7d4134638d4c566ec712abad06c9b947b /nx-X11 | |
parent | b34b47ed5463af3659dae21f3a2c2d68264fab3b (diff) | |
download | nx-libs-00ebfaf535801a8600ac48319b43b9c28e5f6749.tar.gz nx-libs-00ebfaf535801a8600ac48319b43b9c28e5f6749.tar.bz2 nx-libs-00ebfaf535801a8600ac48319b43b9c28e5f6749.zip |
Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and TRANS_REOPEN if not yet defined.
Diffstat (limited to 'nx-X11')
-rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index fd9741389..c1749d26a 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -72,9 +72,15 @@ SOFTWARE. #endif #include <nx-X11/X.h> #include <nx-X11/Xproto.h> -#define XSERV_t -#define TRANS_SERVER -#define TRANS_REOPEN +#ifndef XSERV_t +# define XSERV_t +#endif +#ifndef TRANS_SERVER +# define TRANS_SERVER +#endif +#ifndef TRANS_REOPEN +# define TRANS_REOPEN +#endif #include <nx-X11/Xtrans/Xtrans.h> #include <errno.h> #include <signal.h> |