Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent.

 From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001
 From: Eric Anholt <anholt@freebsd.org>
 Date: Fri, 10 Feb 2006 22:00:30 +0000
 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is
   only of (marginal) use in the drivers, and that usage remains.

 Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#246 (together with merge commit
 ecd335fa61551d0b86d3f075469a7743ab899d95).

8 files changed, 11 insertions, 25 deletions

diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 0cb71de42..3e4fd8a95 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -53,11 +53,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
 #include <stdio.h>
-#endif
 
 #include "protocol-versions.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 50a6db119..de597dead 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -43,9 +45,6 @@ in this Software without prior written authorization from The Open Group.
 #include "protocol-versions.h"
 #include "regionstr.h"
 #include "gcstruct.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 typedef	RegionPtr (*CreateDftPtr)(
 	WindowPtr /* pWin */
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index f27d70ffe..c70f52b6a 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -58,9 +58,7 @@ in this Software without prior written authorization from The Open Group.
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
 #include <nx-X11/Xfuncproto.h>
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
+
 #include "protocol-versions.h"
 
 #ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 0421cd9f9..4f24d5b54 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -54,6 +54,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include <nx-X11/Xmd.h>
@@ -68,14 +70,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/syncstr.h>
 #include "protocol-versions.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#else
 #include <stdio.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif
-#endif
 
 /*
  * Local Global Variables
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index c410a4955..d78efd39b 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -50,9 +50,6 @@ from The Open Group.
 #define EXTENSION_EVENT_BASE	64
 #include "extinit.h"		/* LookupDeviceIntRec */
 #endif /* XINPUT */
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 #if 0
 static unsigned char XTestReqCode;
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index 88536b70e..34f4537f2 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -50,6 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -69,10 +71,6 @@ SOFTWARE.
 #include <X11/extensions/shmproto.h>
 #endif
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 #include "xvdisp.h"
 
 #ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c
index b233299af..3eea84c76 100644
--- a/nx-X11/programs/Xserver/Xext/xvmain.c
+++ b/nx-X11/programs/Xserver/Xext/xvmain.c
@@ -77,6 +77,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -97,10 +99,6 @@ SOFTWARE.
 #include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 0d4849b85..710101d07 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -3,6 +3,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"