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

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

2 files changed, 3 insertions, 11 deletions

diff --git a/record/record.c b/record/record.c
index 5809e0086..95b1bb831 100644
--- a/record/record.c
+++ b/record/record.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.3 2005/04/20 12:25:47 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/record/record.c,v 1.5 2005/07/03 07:02:08 daniels Exp $ */
 /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */
 
 /*
@@ -46,12 +46,8 @@ and Jim Haggerty of Metheus.
 #include <X11/extensions/recordstr.h>
 #include "set.h"
 
-#ifndef XFree86LOADER
 #include <stdio.h>
 #include <assert.h>
-#else
-#include "xf86_ansic.h"
-#endif
 
 #ifdef PANORAMIX
 #include "globals.h"
diff --git a/record/set.c b/record/set.c
index 83fb0e7d7..8419e2900 100644
--- a/record/set.c
+++ b/record/set.c
@@ -55,12 +55,13 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #ifndef TESTING
 #include "misc.h"
 #else
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 /* stuff that you normally get from the X Server's environment */
 
@@ -93,11 +94,6 @@ void *Xcalloc(size)
 
 #include "set.h"
 
-#ifdef XFree86LOADER
-#include "xf86_libc.h"
-#include "xf86_ansic.h"
-#endif
-
 static int
 maxMemberInInterval(pIntervals, nIntervals)
     RecordSetInterval *pIntervals;