xserver: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Tue Jun 9 18:16:27 PDT 2009
dix/enterleave.c | 1 +
include/windowstr.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d4ffcc9e066bc7c49dcff1a2ff0111801c7286d
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Jun 10 11:15:24 2009 +1000
input: move inputstr.h to where its needed.
This stops inputstr.h being needed to be included by output drivers.
Signed-off-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/enterleave.c b/dix/enterleave.c
index d7f5f58..488a943 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -30,6 +30,7 @@
#include <X11/X.h>
#include <X11/extensions/XI2.h>
+#include "inputstr.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "exglobals.h"
diff --git a/include/windowstr.h b/include/windowstr.h
index be909b5..96bee9b 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -59,7 +59,6 @@ SOFTWARE.
#include "miscstruct.h"
#include <X11/Xprotostr.h>
#include "opaque.h"
-#include "inputstr.h"
#define GuaranteeNothing 0
#define GuaranteeVisBack 1
More information about the xorg-commit
mailing list