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

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

4 files changed, 25 insertions, 42 deletions

diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c
index 0980e7884..a4663048b 100644
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@@ -40,39 +40,33 @@
 #ifdef XFree86Server
 # include "xf86.h"
 # include "xf86_OSproc.h"
-# include "drm.h"
-# include "xf86_ansic.h"
 # define _DRM_MALLOC xalloc
 # define _DRM_FREE   xfree
 # ifndef XFree86LOADER
 #  include <sys/mman.h>
 # endif
 #else
-# include <stdio.h>
-# include <stdlib.h>
-# include <unistd.h>
-# include <string.h>
-# include <ctype.h>
-# include <fcntl.h>
-# include <errno.h>
-# include <signal.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# define stat_t struct stat
-# include <sys/ioctl.h>
-# include <sys/mman.h>
-# include <sys/time.h>
-# include <stdarg.h>
-# ifdef DRM_USE_MALLOC
-#  define _DRM_MALLOC malloc
-#  define _DRM_FREE   free
-# else
-#  define _DRM_MALLOC malloc
-#  define _DRM_FREE   free
-# endif
-# include "drm.h"
+# define _DRM_MALLOC malloc
+# define _DRM_FREE   free
 #endif
 
+#include "drm.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#define stat_t struct stat
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include <stdarg.h>
+
 /* No longer needed with CVS kernel modules on alpha 
 #if defined(__alpha__) && defined(__linux__)
 extern unsigned long _bus_base(void);
diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c
index 4fbc88a12..a2567080a 100644
--- a/hw/xfree86/os-support/drm/xf86drmHash.c
+++ b/hw/xfree86/os-support/drm/xf86drmHash.c
@@ -76,18 +76,13 @@
 
 #define HASH_MAIN 0
 
-#if HASH_MAIN
-# include <stdio.h>
-# include <stdlib.h>
-#else
+#include <stdio.h>
+#include <stdlib.h>
+#if !HASH_MAIN
 # include "drm.h"
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
 # endif
 #endif
 
diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c
index 301aaf4c2..cc40dccad 100644
--- a/hw/xfree86/os-support/drm/xf86drmRandom.c
+++ b/hw/xfree86/os-support/drm/xf86drmRandom.c
@@ -79,18 +79,13 @@
 
 #define RANDOM_MAIN 0
 
-#if RANDOM_MAIN
-# include <stdio.h>
-# include <stdlib.h>
-#else
+#include <stdio.h>
+#include <stdlib.h>
+#if !RANDOM_MAIN
 # include "drm.h"
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
 # endif
 #endif
 
diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c
index 5f3c88d23..23283a950 100644
--- a/hw/xfree86/os-support/drm/xf86drmSL.c
+++ b/hw/xfree86/os-support/drm/xf86drmSL.c
@@ -55,7 +55,6 @@
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
 # else
 #  include <stdio.h>
 #  include <stdlib.h>