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

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

14 files changed, 28 insertions, 9 deletions

diff --git a/mfb/mfb.h b/mfb/mfb.h
index 6e7ae43b3..3135f447b 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -1147,12 +1147,5 @@ than a switch on the rop per item (span or rectangle.)
 #define MFB_OP_WHITE    /* nothing */
 #define MFB_OP_BLACK    ~
 
-/*
- * if MFB is built as a module, it shouldn't call libc functions.
- */
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
-
 #endif /* MFB_PROTOTYPES_ONLY */
 #endif /* _MFB_H_ */
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 70e2a9934..58468e3e5 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -54,6 +54,8 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xprotostr.h>
 
+#include <stdlib.h>
+
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c
index ce77fe22c..e66ab6090 100644
--- a/mfb/mfbblt.c
+++ b/mfb/mfbblt.c
@@ -36,6 +36,8 @@ Author: Keith Packard
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include	<X11/X.h>
 #include	<X11/Xmd.h>
 #include	<X11/Xproto.h>
diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c
index 5501f0d5c..2b8a9cea2 100644
--- a/mfb/mfbclip.c
+++ b/mfb/mfbclip.c
@@ -50,6 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "regionstr.h"
 #include "pixmapstr.h"
diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c
index a5442896f..8856eb0ae 100644
--- a/mfb/mfbfillarc.c
+++ b/mfb/mfbfillarc.c
@@ -31,6 +31,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <sys/limits.h>
+
 #include <X11/X.h>
 #include <X11/Xprotostr.h>
 #include "regionstr.h"
@@ -317,7 +319,7 @@ mfbPolyFillArcSolid(pDraw, pGC, narcs, parcs)
  	    box.x2 = x2;
  	    y2 = box.y1 + (int)arc->height + 1;
  	    box.y2 = y2;
- 	    if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ 	    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
  		    (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) )
 	    {
 		if ((arc->angle2 >= FULLCIRCLE) ||
diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c
index c9ff20a45..b248a1caf 100644
--- a/mfb/mfbgc.c
+++ b/mfb/mfbgc.c
@@ -50,6 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c
index 299905701..e2d2438c5 100644
--- a/mfb/mfbimage.c
+++ b/mfb/mfbimage.c
@@ -51,6 +51,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <X11/X.h>
 
 #include "windowstr.h"
diff --git a/mfb/mfbline.c b/mfb/mfbline.c
index af7c27874..465dfd36e 100644
--- a/mfb/mfbline.c
+++ b/mfb/mfbline.c
@@ -50,6 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 
 #include "gcstruct.h"
diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c
index ad0dfe79f..29dcf3d33 100644
--- a/mfb/mfbpixmap.c
+++ b/mfb/mfbpixmap.c
@@ -56,6 +56,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <X11/Xmd.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c
index 9b783f609..83e59cff6 100644
--- a/mfb/mfbply1rct.c
+++ b/mfb/mfbply1rct.c
@@ -32,6 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 
 #include "gcstruct.h"
diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c
index 1cbdf9a5b..49211e6b7 100644
--- a/mfb/mfbpushpxl.c
+++ b/mfb/mfbpushpxl.c
@@ -51,6 +51,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index 9defac1df..db48c9c10 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -51,6 +51,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <X11/X.h>
 #include <X11/Xproto.h>	/* for xColorItem */
 #include <X11/Xmd.h>
diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c
index 56f3f468a..ccc07df1d 100644
--- a/mfb/mfbwindow.c
+++ b/mfb/mfbwindow.c
@@ -52,6 +52,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c
index 92fd81dfb..cc45ee2d4 100644
--- a/mfb/mfbzerarc.c
+++ b/mfb/mfbzerarc.c
@@ -37,6 +37,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <sys/limits.h>
+
 #include <X11/X.h>
 #include <X11/Xprotostr.h>
 #include "regionstr.h"
@@ -246,7 +248,7 @@ mfbZeroPolyArcSS(pDraw, pGC, narcs, parcs)
  	    box.x2 = x2;
  	    y2 = box.y1 + (int)arc->height + 1;
  	    box.y2 = y2;
- 	    if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ 	    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
  		    (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) )
 		mfbZeroArcSS(pDraw, pGC, arc);
 	    else