diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-02 15:28:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-03 08:39:27 +1000 |
| commit | d481720c57f558c47273bf89854fc69254319772 (patch) | |
| tree | fa893f46d8c269f1af6ed281e39680f4c63588bf | |
| parent | 377a5f655ca88cd836da24ab42361df9f3ff51a2 (diff) | |
Xi: standardise XI2 headers.
Adding missing dix-config.h include, adding one missing header guard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xi/xiallowev.h | 8 | ||||
| -rw-r--r-- | Xi/xichangehierarchy.h | 2 | ||||
| -rw-r--r-- | Xi/xigrabdev.h | 8 | ||||
| -rw-r--r-- | Xi/xipassivegrab.h | 8 | ||||
| -rw-r--r-- | Xi/xiproperty.h | 6 | ||||
| -rw-r--r-- | Xi/xiselectev.h | 5 | ||||
| -rw-r--r-- | Xi/xisetdevfocus.h | 4 |
7 files changed, 33 insertions, 8 deletions
diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h index 97a0f251e..3a417b9b1 100644 --- a/Xi/xiallowev.h +++ b/Xi/xiallowev.h @@ -23,10 +23,14 @@ * Author: Peter Hutterer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XIALLOWEV_H -#define XIALLOWEV_H +#define XIALLOWEV_H 1 int ProcXIAllowEvents(ClientPtr client); int SProcXIAllowEvents(ClientPtr client); -#endif +#endif /* XIALLOWEV_H */ diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index b46cfb4e2..483c6cd72 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -41,4 +41,4 @@ int ProcXIChangeHierarchy(ClientPtr /* client */); void XISendDeviceHierarchyEvent(int flags[]); -#endif +#endif /* CHDEVHIER_H */ diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h index 61369978e..08309c932 100644 --- a/Xi/xigrabdev.h +++ b/Xi/xigrabdev.h @@ -23,8 +23,12 @@ * Author: Peter Hutterer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XIGRABDEV_H -#define XIGRABDEV_H +#define XIGRABDEV_H 1 int ProcXIGrabDevice(ClientPtr client); int SProcXIGrabDevice(ClientPtr client); @@ -34,4 +38,4 @@ int SProcXIUngrabDevice(ClientPtr client); void SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep); -#endif +#endif /* XIGRABDEV_H */ diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h index 84fb5eb84..079e7c61b 100644 --- a/Xi/xipassivegrab.h +++ b/Xi/xipassivegrab.h @@ -23,8 +23,12 @@ * Author: Peter Hutterer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XIPASSIVEGRAB_H -#define XIPASSIVEGRAB_H +#define XIPASSIVEGRAB_H 1 int SProcXIPassiveUngrabDevice(ClientPtr client); int ProcXIPassiveUngrabDevice(ClientPtr client); @@ -32,4 +36,4 @@ void SRepXIPassiveGrabDevice(ClientPtr client, int size, xXIPassiveGrabDeviceRep int ProcXIPassiveGrabDevice(ClientPtr client); int SProcXIPassiveGrabDevice(ClientPtr client); -#endif +#endif /* XIPASSIVEGRAB_H */ diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index bc4bbaed9..69b41fafd 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -23,8 +23,12 @@ * Author: Peter Hutterer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XIPROPERTY_H -#define XIPROPERTY_H +#define XIPROPERTY_H 1 int ProcXListDeviceProperties (ClientPtr client); int ProcXChangeDeviceProperty (ClientPtr client); diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h index 5efc6487a..21ec9371b 100644 --- a/Xi/xiselectev.h +++ b/Xi/xiselectev.h @@ -27,9 +27,14 @@ #include <dix-config.h> #endif +#ifndef XISELECTEVENTS_H +#define XISELECTEVENTS_H 1 + int SProcXISelectEvents(ClientPtr client); int ProcXISelectEvents(ClientPtr client); int SProcXIGetSelectedEvents(ClientPtr client); int ProcXIGetSelectedEvents(ClientPtr client); void SRepXIGetSelectedEvents(ClientPtr client, int len, xXIGetSelectedEventsReply *rep); + +#endif /* _XISELECTEVENTS_H_ */ diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h index eb584eb76..2c3243d86 100644 --- a/Xi/xisetdevfocus.h +++ b/Xi/xisetdevfocus.h @@ -23,6 +23,10 @@ * Author: Peter Hutterer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XISETDEVFOCUS_H #define XISETDEVFOCUS_H 1 |