summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-27 16:54:33 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-30 08:43:13 +1000
commit4e9b2938cd8637a5d3b0a4c9f69d6ee75faab3a0 (patch)
treee399904f7ab33652c978d778b84bba71084c5f49 /dix
parentfad5f96c01811af7490a071719e4017c019a8d9b (diff)
include: untangle events.h from the SDK headers.
InternalEvents shouldn't be used anywhere outside the X server itself. Split up into events.h for opaque typedefs for the events needed by various headers and eventstr.h for the actual struct definitions. eventstr.h must only be included by code that requires internal events and is not part of the SDK. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/devices.c1
-rw-r--r--dix/eventconvert.c2
-rw-r--r--dix/events.c1
-rw-r--r--dix/getevents.c2
4 files changed, 4 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 4d006b1f2..32fd4451a 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -72,6 +72,7 @@ SOFTWARE.
#include "swaprep.h"
#include "dixevents.h"
#include "mipointer.h"
+#include "eventstr.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XI2.h>
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 039a17f79..943178e99 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -42,7 +42,7 @@
#include "dix.h"
#include "inputstr.h"
#include "misc.h"
-#include "events.h"
+#include "eventstr.h"
#include "exglobals.h"
#include "eventconvert.h"
#include "xiquerydevice.h"
diff --git a/dix/events.c b/dix/events.c
index f50229a91..a6a10758d 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -162,6 +162,7 @@ typedef const char *string;
#include "geext.h"
#include "geint.h"
+#include "eventstr.h"
#include "enterleave.h"
#include "eventconvert.h"
diff --git a/dix/getevents.c b/dix/getevents.c
index 989564261..ffd749717 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -43,7 +43,7 @@
#include "globals.h"
#include "dixevents.h"
#include "mipointer.h"
-#include "events.h"
+#include "eventstr.h"
#include "eventconvert.h"
#include <X11/extensions/XKBproto.h>