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, 14 insertions, 12 deletions

diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
index 1145186e7..dd5e40ffe 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
@@ -38,6 +38,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c
index fa930cf5b..a5a5e37ae 100644
--- a/nx-X11/programs/Xserver/GL/glx/glximports.c
+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c
@@ -37,6 +37,10 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "glxserver.h"
 #include "glxcontext.h"
 #include "glximports.h"
diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
index 88833e154..6b274a64b 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
@@ -37,12 +37,8 @@
 #include <dix-config.h>
 #endif
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
 #include <string.h>
 #include <signal.h>
-#endif
 
 #include <windowstr.h>
 
diff --git a/nx-X11/programs/Xserver/GL/glx/glxutil.c b/nx-X11/programs/Xserver/GL/glx/glxutil.c
index b8d4874aa..5d40bc832 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxutil.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxutil.c
@@ -38,6 +38,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/single2.c b/nx-X11/programs/Xserver/GL/glx/single2.c
index d6d689935..d36e57739 100644
--- a/nx-X11/programs/Xserver/GL/glx/single2.c
+++ b/nx-X11/programs/Xserver/GL/glx/single2.c
@@ -37,6 +37,10 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
index c4e9c01e9..f48ecb8bb 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
@@ -55,9 +55,6 @@
 
 #ifdef XFree86Server
 
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
 #ifndef assert
 #define assert(a)
 #endif
@@ -111,4 +108,3 @@
 #define __glXAtoi(a)			atoi(a)
 
 #endif /* _glx_ansic_h_ */
-
diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
index 8a4472874..9e69fac65 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
@@ -36,7 +36,3 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "miscstruct.h"
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
index 976818f07..d0d8eb239 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
@@ -35,6 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <gcstruct.h>
 #include "pixmapstr.h"
 #include "xf86glx_util.h"