xserver: Branch 'input-hotplug' - 2 commits

[Daniel Stone]

 hw/dmx/glxProxy/glxext.c     |    1 +
 hw/dmx/glxProxy/glxscreens.c |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 3518e2d0debc97e2bacdefe604b280e7fdfdd216 (from parents)
Merge: eb7733a48a92405660d5d2ab60913b62c30daaed 3821f6aeaa714582ee0a631de96c6e7cfd96303e
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Jul 26 11:29:21 2006 +0300

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

diff-tree 3821f6aeaa714582ee0a631de96c6e7cfd96303e (from 8977b07434d75ca396d236dc1324f0c862b633c7)
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Wed Jul 26 01:56:02 2006 -0400

    Unlibc-wrap DMX glxscreens.c and fix tag-removal typo.

diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index 136a79d..de8bef8 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -1,3 +1,4 @@
+/*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
 ** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c
index 4ddd476..0f9012d 100644
--- a/hw/dmx/glxProxy/glxscreens.c
+++ b/hw/dmx/glxProxy/glxscreens.c
@@ -47,8 +47,6 @@
 
 #include "glxserver.h"
 
-#include <xf86_ansic.h>
-
 #include <windowstr.h>
 
 #include "glxfbconfig.h"