aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 16:00:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 16:00:04 +0200
commitda7261cfe0244fcf329e0597f9d122293fd4f9eb (patch)
treefe39b99fe89ac4fa65fec9c974379b5c52ada016 /nx-X11/programs
parent2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (diff)
parent1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf (diff)
downloadnx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.gz
nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.bz2
nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.zip
Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.x
Attributes GH PR #175: https://github.com/ArcticaProject/nx-libs/pull/175
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/Imakefile8
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h5
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c3
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c4
-rw-r--r--nx-X11/programs/Xserver/Xext/xvdisp.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Agent.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miscrinit.c2
9 files changed, 14 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 93a3286b1..1c582614d 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -429,7 +429,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
- -lNX_X11 -lNX_Xext
+ -lNX_X11 -lXext
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp \
-L../../../nx-X11/exports/lib \
@@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \
- -lNX_X11 -lNX_Xext
+ -lNX_X11 -lXext
#else
NXAGENTNXLIBS = -L ../../../nxcomp \
-L../../../nx-X11/exports/lib \
@@ -445,7 +445,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
- -lNX_X11 -lNX_Xext
+ -lNX_X11 -lXext
#endif
#endif
@@ -478,7 +478,7 @@ nxagent_static_nolibs: nxagent
else exit 0; fi
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \
- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS)
+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS)
#endif /* NXAgentServer */
#if defined(NXWinServer) && NXWinServer
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 96a349add..094837d34 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -11,8 +11,7 @@
#ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
-#define _SHAPE_SERVER_ /* don't want Xlib structures */
-#include <nx-X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
#endif
#ifdef XTEST
@@ -68,7 +67,7 @@ extern void ResExtensionInit(INITARGS);
#ifdef SHM
extern void ShmExtensionInit(INITARGS);
-#include <nx-X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
extern void ShmSetPixmapFormat(
ScreenPtr pScreen,
int format);
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 8516192c0..51fcd7d9f 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -44,8 +44,7 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#define _SHAPE_SERVER_ /* don't want Xlib structures */
-#include <nx-X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
#include "regionstr.h"
#include "gcstruct.h"
#ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index 94d6b4ac1..bca8c2e0e 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
#include "extnsionst.h"
#include "servermd.h"
#define _XSHM_SERVER_
-#include <nx-X11/extensions/shmstr.h>
+#include <X11/extensions/shmstr.h>
#include <nx-X11/Xfuncproto.h>
#ifdef EXTMODULE
#include "xf86_ansic.h"
@@ -1319,4 +1319,4 @@ SProcShmDispatch (client)
return BadRequest;
}
}
-#endif /* NXAGENT_SERVER */ \ No newline at end of file
+#endif /* NXAGENT_SERVER */
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index ecd4f9a66..3bcb130c7 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -68,7 +68,7 @@ SOFTWARE.
#include "xvdix.h"
#ifdef MITSHM
#define _XSHM_SERVER_
-#include <nx-X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
#endif
#ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index ec312bad2..2fa2b6240 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -104,7 +104,7 @@ typedef XID KeySym64;
#define NX_TRANS_SOCKET
#define GC XlibGC
#include <nx-X11/Xlib.h>
-#include <nx-X11/extensions/shape.h>
+#include <X11/extensions/shape.h>
#undef GC
#ifdef _XSERVER64_tmp
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 72da2df19..866ab581c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -44,7 +44,7 @@
#undef Pixmap
#include "region.h"
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
#include "Display.h"
#include "Pixmaps.h"
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b58202ebd..dcd91c5e0 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -158,7 +158,7 @@ typedef void (*InitExtension)(INITARGS);
#ifdef MITSHM
#define _XSHM_SERVER_
-#include <nx-X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
#endif
#ifdef XTEST
#define _XTEST_SERVER_
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c
index addd5dd64..da80932ad 100644
--- a/nx-X11/programs/Xserver/mi/miscrinit.c
+++ b/nx-X11/programs/Xserver/mi/miscrinit.c
@@ -42,7 +42,7 @@ from The Open Group.
#include "miline.h"
#ifdef MITSHM
#define _XSHM_SERVER_
-#include <nx-X11/extensions/XShm.h>
+#include <X11/extensions/XShm.h>
#endif
/* We use this structure to propogate some information from miScreenInit to