Similar to ICE_t just set the define globally and remove the multiple definitions throughout the tree
Signed-off-by: Emil Velikov <[email protected]> --- configure.ac | 2 ++ src/Makefile.am | 3 +-- src/icetrans.c | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e76cf8..0505743 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,8 @@ PKG_CHECK_MODULES(ICE, xproto xtrans) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS AC_DEFINE(ICE_t, 1, [Xtrans transport type]) +AC_DEFINE(TRANS_CLIENT, 1, [Xtrans transport client code]) +AC_DEFINE(TRANS_SERVER, 1, [Xtrans transport server code]) # Checks for library functions. AC_CHECK_LIB([bsd], [arc4random_buf]) diff --git a/src/Makefile.am b/src/Makefile.am index a23edb2..c69ee55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,7 @@ AM_CPPFLAGS = -I${top_srcdir}/include AM_CFLAGS = \ $(ICE_CFLAGS) \ - $(CWARNFLAGS) \ - -DTRANS_CLIENT -DTRANS_SERVER + $(CWARNFLAGS) libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined diff --git a/src/icetrans.c b/src/icetrans.c index f224f07..ddcdac9 100644 --- a/src/icetrans.c +++ b/src/icetrans.c @@ -26,9 +26,6 @@ #include <X11/Xfuncproto.h> -#define TRANS_CLIENT 1 -#define TRANS_SERVER 1 - /* The following function is implemented via the Xtrans package based on the * transport.c include. * -- 2.8.0 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
