summaryrefslogtreecommitdiff
path: root/XTrap
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2006-02-10 22:00:30 +0000
committerEric Anholt <anholt@freebsd.org>2006-02-10 22:00:30 +0000
commitc3d14036729fd186d4ec7ca1de603e1f2d174e2f (patch)
tree6fc1290e4da4a16eea3c10c250d302df6b9e98c2 /XTrap
parenta8cec1b656f57746758613213de1d6e5acb79451 (diff)
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
Diffstat (limited to 'XTrap')
-rw-r--r--XTrap/xtrapddmi.c2
-rw-r--r--XTrap/xtrapdi.c4
-rw-r--r--XTrap/xtrapditbl.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c
index 2dba356b7..afaf105f2 100644
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@@ -50,8 +50,6 @@ SOFTWARE.
# include "io.h"
# define O_NDELAY 0L
#endif
-#else
-#include "xf86_ansic.h"
#endif
#define NEED_REPLIES
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index f08c6155a..8b045cd19 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.2 2004/04/23 18:44:40 eich Exp $ */
+/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.5 2005/07/03 08:53:36 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@@ -59,8 +59,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <errno.h>
#include <X11/Xos.h>
-#else
-#include "xf86_ansic.h"
#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c
index a9ceddb3d..27cfc362b 100644
--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@@ -39,6 +39,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include <X11/X.h>
#define NEED_REPLIES
#define NEED_EVENTS