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>
This commit is contained in:
Peter Hutterer 2009-09-02 15:28:28 +10:00
parent 377a5f655c
commit d481720c57
7 changed files with 33 additions and 8 deletions

View File

@ -23,10 +23,14 @@
* Author: Peter Hutterer * Author: Peter Hutterer
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIALLOWEV_H #ifndef XIALLOWEV_H
#define XIALLOWEV_H #define XIALLOWEV_H 1
int ProcXIAllowEvents(ClientPtr client); int ProcXIAllowEvents(ClientPtr client);
int SProcXIAllowEvents(ClientPtr client); int SProcXIAllowEvents(ClientPtr client);
#endif #endif /* XIALLOWEV_H */

View File

@ -41,4 +41,4 @@ int ProcXIChangeHierarchy(ClientPtr /* client */);
void XISendDeviceHierarchyEvent(int flags[]); void XISendDeviceHierarchyEvent(int flags[]);
#endif #endif /* CHDEVHIER_H */

View File

@ -23,8 +23,12 @@
* Author: Peter Hutterer * Author: Peter Hutterer
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIGRABDEV_H #ifndef XIGRABDEV_H
#define XIGRABDEV_H #define XIGRABDEV_H 1
int ProcXIGrabDevice(ClientPtr client); int ProcXIGrabDevice(ClientPtr client);
int SProcXIGrabDevice(ClientPtr client); int SProcXIGrabDevice(ClientPtr client);
@ -34,4 +38,4 @@ int SProcXIUngrabDevice(ClientPtr client);
void SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep); void SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep);
#endif #endif /* XIGRABDEV_H */

View File

@ -23,8 +23,12 @@
* Author: Peter Hutterer * Author: Peter Hutterer
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIPASSIVEGRAB_H #ifndef XIPASSIVEGRAB_H
#define XIPASSIVEGRAB_H #define XIPASSIVEGRAB_H 1
int SProcXIPassiveUngrabDevice(ClientPtr client); int SProcXIPassiveUngrabDevice(ClientPtr client);
int ProcXIPassiveUngrabDevice(ClientPtr client); int ProcXIPassiveUngrabDevice(ClientPtr client);
@ -32,4 +36,4 @@ void SRepXIPassiveGrabDevice(ClientPtr client, int size, xXIPassiveGrabDeviceRep
int ProcXIPassiveGrabDevice(ClientPtr client); int ProcXIPassiveGrabDevice(ClientPtr client);
int SProcXIPassiveGrabDevice(ClientPtr client); int SProcXIPassiveGrabDevice(ClientPtr client);
#endif #endif /* XIPASSIVEGRAB_H */

View File

@ -23,8 +23,12 @@
* Author: Peter Hutterer * Author: Peter Hutterer
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIPROPERTY_H #ifndef XIPROPERTY_H
#define XIPROPERTY_H #define XIPROPERTY_H 1
int ProcXListDeviceProperties (ClientPtr client); int ProcXListDeviceProperties (ClientPtr client);
int ProcXChangeDeviceProperty (ClientPtr client); int ProcXChangeDeviceProperty (ClientPtr client);

View File

@ -27,9 +27,14 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifndef XISELECTEVENTS_H
#define XISELECTEVENTS_H 1
int SProcXISelectEvents(ClientPtr client); int SProcXISelectEvents(ClientPtr client);
int ProcXISelectEvents(ClientPtr client); int ProcXISelectEvents(ClientPtr client);
int SProcXIGetSelectedEvents(ClientPtr client); int SProcXIGetSelectedEvents(ClientPtr client);
int ProcXIGetSelectedEvents(ClientPtr client); int ProcXIGetSelectedEvents(ClientPtr client);
void SRepXIGetSelectedEvents(ClientPtr client, void SRepXIGetSelectedEvents(ClientPtr client,
int len, xXIGetSelectedEventsReply *rep); int len, xXIGetSelectedEventsReply *rep);
#endif /* _XISELECTEVENTS_H_ */

View File

@ -23,6 +23,10 @@
* Author: Peter Hutterer * Author: Peter Hutterer
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XISETDEVFOCUS_H #ifndef XISETDEVFOCUS_H
#define XISETDEVFOCUS_H 1 #define XISETDEVFOCUS_H 1