Remove libcwrapper usage from xorg server modules. The libcwrapper is only

    of (marginal) use in the drivers, and that usage remains.

12 files changed, 31 insertions, 27 deletions

diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 214e2e6dd..d18ef70ce 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -27,9 +27,9 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
 #ifdef XFree86LOADER
 #include "xf86.h"
-#include "xf86_ansic.h"
 #endif
 
 #include "fb.h"
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 315aa181c..98cf8796c 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -29,9 +29,7 @@
 
 #include "fb.h"
 #include "mizerarc.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
+#include <limits.h>
 
 typedef void	(*FbArc) (FbBits    *dst, 
 			  FbStride  dstStride, 
@@ -100,7 +98,7 @@ fbPolyArc (DrawablePtr	pDrawable,
 		    box.x2 = x2;
 		    y2 = box.y1 + (int)parcs->height + 1;
 		    box.y2 = y2;
-		    if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+		    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
 			(RECT_IN_REGION(pDrawable->pScreen, cclip, &box) == rgnIN) )
 			(*arc) (dst, dstStride, dstBpp, 
 				parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, 
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 9c2ec4887..f8e0139f0 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.23 2005/10/03 11:43:55 anholt Exp $
+ * $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26 2005/12/09 18:35:20 ajax Exp $
  * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@@ -33,10 +33,14 @@
 
 #ifdef RENDER
 
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
 #include "picturestr.h"
 #include "mipict.h"
 #include "fbpict.h"
-#include <math.h>
 
 #define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
 
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 1e7b93435..73224da8f 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -27,10 +27,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 #include "fbmmx.h"
 
 void
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 5a0d0bcb3..7df026288 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,17 +21,16 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.5 2005/07/03 07:01:23 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.6 2006/01/18 06:49:17 airlied Exp $ */
 /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 const GCFuncs fbGCFuncs = {
     fbValidateGC,
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 96bd8cf95..174c78bd0 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -27,12 +27,9 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
+#include <string.h>
 
+#include "fb.h"
 
 void
 fbPutImage (DrawablePtr	pDrawable,
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index e777d8e06..e9fb9b24f 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -23,14 +23,17 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
-/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */
+/* $XdotOrg: xserver/xorg/fb/fboverlay.c,v 1.7 2005/07/03 07:01:23 daniels Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
 #include "fboverlay.h"
+#include "shmint.h"
 
 int	fbOverlayGeneration;
 int	fbOverlayScreenPrivateIndex = -1;
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 5ab3756b9..591ddffe3 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -27,6 +27,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "fb.h"
 
 #ifdef RENDER
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index decc07ba6..1e12d8818 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -27,10 +27,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 PixmapPtr
 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index ef40b7073..3e7b49cc6 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -2,6 +2,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 18a996e0c..777ff7055 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -27,6 +27,8 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
 #include "miline.h"
 
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 7b96f18c3..d4046b5f1 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.8 2005/07/03 07:01:23 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/fb/fbwindow.c,v 1.9 2005/10/02 08:28:26 anholt Exp $ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
@@ -28,10 +28,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 Bool
 fbCreateWindow(WindowPtr pWin)