aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-08-27 01:44:41 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:52:31 +0200
commitd3ae0b2c9559e70448746240caaf5634c78d0eef (patch)
treeffc95058fce33699bba6a574240030c7400e05d8 /nx-X11/lib/X11
parent385dc2b070df1e19853a009bfe32204e0c5b2dd7 (diff)
downloadnx-libs-d3ae0b2c9559e70448746240caaf5634c78d0eef.tar.gz
nx-libs-d3ae0b2c9559e70448746240caaf5634c78d0eef.tar.bz2
nx-libs-d3ae0b2c9559e70448746240caaf5634c78d0eef.zip
replace {x11,xim}trans.c links by libX11 1.3.4 solution
Diffstat (limited to 'nx-X11/lib/X11')
-rw-r--r--nx-X11/lib/X11/Imakefile18
-rw-r--r--nx-X11/lib/X11/x11_trans.c30
-rw-r--r--nx-X11/lib/X11/xim_trans.c30
3 files changed, 68 insertions, 10 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 9e1ceb255..76f26be5d 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -147,8 +147,8 @@ EXTRA_LIBRARIES = /**/
POLL_DEFINES = -DUSE_POLL
#endif
CONN_DEFINES = $(CONNECTION_FLAGS)
- XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES)
- XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES)
+ XTRANS_X_DEFINES = $(XTRANS_FAILDEFINES)
+ XTRANS_XIM_DEFINES = $(XTRANS_FAILDEFINES)
#if HasBSD44Sockets
SOCK_DEFINES = -DBSD44SOCKETS
#endif
@@ -800,8 +800,8 @@ SRCS3 = \
RegstFlt.c \
locking.c \
LockDis.c \
- x11trans.c \
- ximtrans.c \
+ x11_trans.c \
+ xim_trans.c \
$(XKBSRCS) $(LCSRCS) $(MISCSRCS)
OBJS3 = \
@@ -883,8 +883,8 @@ OBJS3 = \
RegstFlt.o \
locking.o \
LockDis.o \
- x11trans.o \
- ximtrans.o \
+ x11_trans.o \
+ xim_trans.o \
$(XKBOBJS) $(LCOBJS) $(MISCOBJS)
#if BuildLoadableXlibI18n
@@ -1065,10 +1065,8 @@ EXTRASHAREDOBJS = $(STATICLCOBJS)
SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
SpecialCLibObjectRule(StrKeysym,$(ICONFIGFILES),$(KDB_DEFINES))
SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS))
-SpecialCLibObjectRule(x11trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
-LinkFile(x11trans.c,$(TRANSCOMMSRC)/transport.c)
-SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
-LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
+SpecialCLibObjectRule(x11_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
+SpecialCLibObjectRule(xim_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
diff --git a/nx-X11/lib/X11/x11_trans.c b/nx-X11/lib/X11/x11_trans.c
new file mode 100644
index 000000000..40df7b9b1
--- /dev/null
+++ b/nx-X11/lib/X11/x11_trans.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Keith Packard makes no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define X11_t 1
+#define TRANS_CLIENT 1
+#include <nx-X11/Xtrans/transport.c>
+
diff --git a/nx-X11/lib/X11/xim_trans.c b/nx-X11/lib/X11/xim_trans.c
new file mode 100644
index 000000000..928038ae2
--- /dev/null
+++ b/nx-X11/lib/X11/xim_trans.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Keith Packard makes no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define XIM_t 1
+#define TRANS_CLIENT 1
+
+#include <nx-X11/Xtrans/transport.c>