From 88693ad15f57b09d0b9dc6d9f14ba5d9db353eaf Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Mon, 23 Jun 2025 21:58:56 +0100 Subject: [PATCH] xi: move include guards up to wrap the whole file See: https://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html Signed-off-by: Mike Gelfand --- Xi/allowev.h | 6 +++--- Xi/chgdctl.h | 6 +++--- Xi/chgfctl.h | 6 +++--- Xi/chgkbd.h | 6 +++--- Xi/chgkmap.h | 6 +++--- Xi/chgprop.h | 6 +++--- Xi/chgptr.h | 6 +++--- Xi/closedev.h | 6 +++--- Xi/devbell.h | 6 +++--- Xi/exglobals.h | 16 ++++++++-------- Xi/getbmap.h | 6 +++--- Xi/getdctl.h | 6 +++--- Xi/getfctl.h | 6 +++--- Xi/getfocus.h | 6 +++--- Xi/getkmap.h | 6 +++--- Xi/getmmap.h | 6 +++--- Xi/getprop.h | 6 +++--- Xi/getselev.h | 6 +++--- Xi/getvers.h | 6 +++--- Xi/grabdev.h | 6 +++--- Xi/grabdevb.h | 6 +++--- Xi/grabdevk.h | 6 +++--- Xi/gtmotion.h | 6 +++--- Xi/listdev.h | 6 +++--- Xi/opendev.h | 6 +++--- Xi/queryst.h | 6 +++--- Xi/selectev.h | 6 +++--- Xi/sendexev.h | 6 +++--- Xi/setbmap.h | 6 +++--- Xi/setdval.h | 6 +++--- Xi/setfocus.h | 6 +++--- Xi/setmmap.h | 6 +++--- Xi/setmode.h | 6 +++--- Xi/ungrdev.h | 6 +++--- Xi/ungrdevb.h | 6 +++--- Xi/ungrdevk.h | 6 +++--- Xi/xiallowev.h | 6 +++--- Xi/xibarriers.h | 5 ++--- Xi/xichangecursor.h | 6 +++--- Xi/xichangehierarchy.h | 14 +++++++------- Xi/xigetclientpointer.h | 6 +++--- Xi/xigrabdev.h | 6 +++--- Xi/xipassivegrab.h | 6 +++--- Xi/xiproperty.h | 6 +++--- Xi/xiquerydevice.h | 6 +++--- Xi/xiquerypointer.h | 6 +++--- Xi/xiqueryversion.h | 6 +++--- Xi/xiselectev.h | 6 +++--- Xi/xisetclientpointer.h | 6 +++--- Xi/xisetdevfocus.h | 6 +++--- Xi/xiwarppointer.h | 6 +++--- 51 files changed, 161 insertions(+), 162 deletions(-) diff --git a/Xi/allowev.h b/Xi/allowev.h index f081ab52e..3084dfb99 100644 --- a/Xi/allowev.h +++ b/Xi/allowev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef ALLOWEV_H +#define ALLOWEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef ALLOWEV_H -#define ALLOWEV_H 1 - int SProcXAllowDeviceEvents(ClientPtr /* client */ ); diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h index 3924f7251..94c737673 100644 --- a/Xi/chgdctl.h +++ b/Xi/chgdctl.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGDCTL_H +#define CHGDCTL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGDCTL_H -#define CHGDCTL_H 1 - int SProcXChangeDeviceControl(ClientPtr /* client */ ); diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h index 45a55a5f8..569d19c56 100644 --- a/Xi/chgfctl.h +++ b/Xi/chgfctl.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGFCTL_H +#define CHGFCTL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGFCTL_H -#define CHGFCTL_H 1 - int SProcXChangeFeedbackControl(ClientPtr /* client */ ); diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index 55ea3947a..95f190cd5 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGKBD_H +#define CHGKBD_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGKBD_H -#define CHGKBD_H 1 - int ProcXChangeKeyboardDevice(ClientPtr /* client */ ); diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h index 633af7ca4..12aae26cc 100644 --- a/Xi/chgkmap.h +++ b/Xi/chgkmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGKMAP_H +#define CHGKMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGKMAP_H -#define CHGKMAP_H 1 - int SProcXChangeDeviceKeyMapping(ClientPtr /* client */ ); diff --git a/Xi/chgprop.h b/Xi/chgprop.h index 89d6b5695..58428fa10 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGPROP_H +#define CHGPROP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGPROP_H -#define CHGPROP_H 1 - int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */ ); diff --git a/Xi/chgptr.h b/Xi/chgptr.h index 3a85f0f03..ccb66baf8 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CHGPTR_H +#define CHGPTR_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHGPTR_H -#define CHGPTR_H 1 - int ProcXChangePointerDevice(ClientPtr /* client */ ); diff --git a/Xi/closedev.h b/Xi/closedev.h index 201d14f0a..31ea412df 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef CLOSEDEV_H +#define CLOSEDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CLOSEDEV_H -#define CLOSEDEV_H 1 - int ProcXCloseDevice(ClientPtr /* client */ ); diff --git a/Xi/devbell.h b/Xi/devbell.h index c83a9d4b0..cb57db142 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef DEVBELL_H +#define DEVBELL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef DEVBELL_H -#define DEVBELL_H 1 - int ProcXDeviceBell(ClientPtr /* client */ ); diff --git a/Xi/exglobals.h b/Xi/exglobals.h index 02c9fe9d1..2691d0276 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -23,19 +23,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/***************************************************************** - * - * Globals referenced elsewhere in the server. - * - */ +#ifndef EXGLOBALS_H +#define EXGLOBALS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif #include "privates.h" -#ifndef EXGLOBALS_H -#define EXGLOBALS_H 1 - +/***************************************************************** + * + * Globals referenced elsewhere in the server. + * + */ extern int IEventBase; extern int BadDevice; extern int BadMode; diff --git a/Xi/getbmap.h b/Xi/getbmap.h index 78cb15198..86540056c 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETBMAP_H +#define GETBMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETBMAP_H -#define GETBMAP_H 1 - int ProcXGetDeviceButtonMapping(ClientPtr /* client */ ); diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 430b75b1d..4fee2cac1 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETDCTL_H +#define GETDCTL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETDCTL_H -#define GETDCTL_H 1 - int SProcXGetDeviceControl(ClientPtr /* client */ ); diff --git a/Xi/getfctl.h b/Xi/getfctl.h index 63083432e..5aa921509 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETFCTL_H +#define GETFCTL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETFCTL_H -#define GETFCTL_H 1 - int ProcXGetFeedbackControl(ClientPtr /* client */ ); diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 00650c17d..9476337ef 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETFOCUS_H +#define GETFOCUS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETFOCUS_H -#define GETFOCUS_H 1 - int ProcXGetDeviceFocus(ClientPtr /* client */ ); diff --git a/Xi/getkmap.h b/Xi/getkmap.h index 74e2e5b78..cd1ecc4c0 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETKMAP_H +#define GETKMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETKMAP_H -#define GETKMAP_H 1 - int ProcXGetDeviceKeyMapping(ClientPtr /* client */ ); diff --git a/Xi/getmmap.h b/Xi/getmmap.h index feef7c505..9022f13cb 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETMMAP_H +#define GETMMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETMMAP_H -#define GETMMAP_H 1 - int ProcXGetDeviceModifierMapping(ClientPtr /* client */ ); diff --git a/Xi/getprop.h b/Xi/getprop.h index 59225cba9..b160c9026 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETPROP_H +#define GETPROP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETPROP_H -#define GETPROP_H 1 - int SProcXGetDeviceDontPropagateList(ClientPtr /* client */ ); diff --git a/Xi/getselev.h b/Xi/getselev.h index bcb8ebcbb..8c65cac4a 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETSELEV_H +#define GETSELEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETSELEV_H -#define GETSELEV_H 1 - int SProcXGetSelectedExtensionEvents(ClientPtr /* client */ ); diff --git a/Xi/getvers.h b/Xi/getvers.h index 678046d1d..cd4279f79 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GETVERS_H +#define GETVERS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETVERS_H -#define GETVERS_H 1 - int SProcXGetExtensionVersion(ClientPtr /* client */ ); diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 8dfcab70d..b2e5395a9 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GRABDEV_H +#define GRABDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GRABDEV_H -#define GRABDEV_H 1 - int SProcXGrabDevice(ClientPtr /* client */ ); diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index b2a9796b5..a2bf356a4 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GRABDEVB_H +#define GRABDEVB_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GRABDEVB_H -#define GRABDEVB_H 1 - int SProcXGrabDeviceButton(ClientPtr /* client */ ); diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index 85738affa..76d8fcde1 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GRABDEVK_H +#define GRABDEVK_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GRABDEVK_H -#define GRABDEVK_H 1 - int SProcXGrabDeviceKey(ClientPtr /* client */ ); diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index 70e75b85a..1aa9316b9 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef GTMOTION_H +#define GTMOTION_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GTMOTION_H -#define GTMOTION_H 1 - int SProcXGetDeviceMotionEvents(ClientPtr /* client */ ); diff --git a/Xi/listdev.h b/Xi/listdev.h index 65a62220d..c9f947cfb 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef LISTDEV_H +#define LISTDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef LISTDEV_H -#define LISTDEV_H 1 - #define VPC 20 /* Max # valuators per chunk */ int ProcXListInputDevices(ClientPtr /* client */ diff --git a/Xi/opendev.h b/Xi/opendev.h index 89b326d43..64e9db853 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef OPENDEV_H +#define OPENDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef OPENDEV_H -#define OPENDEV_H 1 - int ProcXOpenDevice(ClientPtr /* client */ ); diff --git a/Xi/queryst.h b/Xi/queryst.h index 32960b1cd..e2935d642 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef QUERYST_H +#define QUERYST_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef QUERYST_H -#define QUERYST_H 1 - int ProcXQueryDeviceState(ClientPtr /* client */ ); diff --git a/Xi/selectev.h b/Xi/selectev.h index e80fe4a43..b00530426 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SELECTEV_H +#define SELECTEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SELECTEV_H -#define SELECTEV_H 1 - int SProcXSelectExtensionEvent(ClientPtr /* client */ ); diff --git a/Xi/sendexev.h b/Xi/sendexev.h index 38c66434d..4ce03c8cf 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SENDEXEV_H +#define SENDEXEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SENDEXEV_H -#define SENDEXEV_H 1 - int SProcXSendExtensionEvent(ClientPtr /* client */ ); diff --git a/Xi/setbmap.h b/Xi/setbmap.h index f4bb22cb7..a9a48fb92 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SETBMAP_H +#define SETBMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETBMAP_H -#define SETBMAP_H 1 - int ProcXSetDeviceButtonMapping(ClientPtr /* client */ ); diff --git a/Xi/setdval.h b/Xi/setdval.h index 644bbcfbe..06dade916 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SETDVAL_H +#define SETDVAL_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETDVAL_H -#define SETDVAL_H 1 - int ProcXSetDeviceValuators(ClientPtr /* client */ ); diff --git a/Xi/setfocus.h b/Xi/setfocus.h index 0adf45157..e7755a847 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SETFOCUS_H +#define SETFOCUS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETFOCUS_H -#define SETFOCUS_H 1 - int SProcXSetDeviceFocus(ClientPtr /* client */ ); diff --git a/Xi/setmmap.h b/Xi/setmmap.h index a7de58d3a..210d60f4b 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SETMMAP_H +#define SETMMAP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETMMAP_H -#define SETMMAP_H 1 - int ProcXSetDeviceModifierMapping(ClientPtr /* client */ ); diff --git a/Xi/setmode.h b/Xi/setmode.h index 68bdddbc5..2423783b0 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef SETMODE_H +#define SETMODE_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETMODE_H -#define SETMODE_H 1 - int ProcXSetDeviceMode(ClientPtr /* client */ ); diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 8a85c27f1..ca6700048 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef UNGRDEV_H +#define UNGRDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef UNGRDEV_H -#define UNGRDEV_H 1 - int SProcXUngrabDevice(ClientPtr /* client */ ); diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 97d8aede1..bc4bbeb2d 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef UNGRDEVB_H +#define UNGRDEVB_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef UNGRDEVB_H -#define UNGRDEVB_H 1 - int SProcXUngrabDeviceButton(ClientPtr /* client */ ); diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index 1c4bab65b..408c66988 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef UNGRDEVK_H +#define UNGRDEVK_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef UNGRDEVK_H -#define UNGRDEVK_H 1 - int SProcXUngrabDeviceKey(ClientPtr /* client */ ); diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h index c24ac3df4..106cd5164 100644 --- a/Xi/xiallowev.h +++ b/Xi/xiallowev.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XIALLOWEV_H +#define XIALLOWEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XIALLOWEV_H -#define XIALLOWEV_H 1 - int ProcXIAllowEvents(ClientPtr client); int SProcXIAllowEvents(ClientPtr client); diff --git a/Xi/xibarriers.h b/Xi/xibarriers.h index 386a6ebe5..a6df1673e 100644 --- a/Xi/xibarriers.h +++ b/Xi/xibarriers.h @@ -1,11 +1,10 @@ +#ifndef _XIBARRIERS_H_ +#define _XIBARRIERS_H_ #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _XIBARRIERS_H_ -#define _XIBARRIERS_H_ - #include "resource.h" extern RESTYPE PointerBarrierType; diff --git a/Xi/xichangecursor.h b/Xi/xichangecursor.h index 14477772a..5645aef60 100644 --- a/Xi/xichangecursor.h +++ b/Xi/xichangecursor.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef CHDEVCUR_H +#define CHDEVCUR_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef CHDEVCUR_H -#define CHDEVCUR_H 1 - int SProcXIChangeCursor(ClientPtr /* client */ ); int ProcXIChangeCursor(ClientPtr /* client */ ); diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index 8fa3a66e7..c4d4810c0 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -23,19 +23,19 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef CHDEVHIER_H +#define CHDEVHIER_H 1 + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + /*********************************************************************** * * Request change in the device hierarchy. * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef CHDEVHIER_H -#define CHDEVHIER_H 1 - int ProcXIChangeHierarchy(ClientPtr /* client */ ); void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]); diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h index 2e3cfc330..cf7c8ea4f 100644 --- a/Xi/xigetclientpointer.h +++ b/Xi/xigetclientpointer.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef GETCPTR_H +#define GETCPTR_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef GETCPTR_H -#define GETCPTR_H 1 - int SProcXIGetClientPointer(ClientPtr /* client */ ); int ProcXIGetClientPointer(ClientPtr /* client */ ); diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h index 3deacffed..875dae4cf 100644 --- a/Xi/xigrabdev.h +++ b/Xi/xigrabdev.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XIGRABDEV_H +#define XIGRABDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XIGRABDEV_H -#define XIGRABDEV_H 1 - int ProcXIGrabDevice(ClientPtr client); int SProcXIGrabDevice(ClientPtr client); diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h index de59ab990..836fb0f7a 100644 --- a/Xi/xipassivegrab.h +++ b/Xi/xipassivegrab.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XIPASSIVEGRAB_H +#define XIPASSIVEGRAB_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XIPASSIVEGRAB_H -#define XIPASSIVEGRAB_H 1 - int SProcXIPassiveUngrabDevice(ClientPtr client); int ProcXIPassiveUngrabDevice(ClientPtr client); int ProcXIPassiveGrabDevice(ClientPtr client); diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index 5edc28733..b0324c074 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XIPROPERTY_H +#define XIPROPERTY_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XIPROPERTY_H -#define XIPROPERTY_H 1 - int ProcXListDeviceProperties(ClientPtr client); int ProcXChangeDeviceProperty(ClientPtr client); int ProcXDeleteDeviceProperty(ClientPtr client); diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h index 5f6fee3db..7df025c44 100644 --- a/Xi/xiquerydevice.h +++ b/Xi/xiquerydevice.h @@ -24,13 +24,13 @@ * */ +#ifndef QUERYDEV_H +#define QUERYDEV_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef QUERYDEV_H -#define QUERYDEV_H 1 - #include int SProcXIQueryDevice(ClientPtr client); diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h index f4dfacc4f..2d4973a50 100644 --- a/Xi/xiquerypointer.h +++ b/Xi/xiquerypointer.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef QUERYDP_H +#define QUERYDP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef QUERYDP_H -#define QUERYDP_H 1 - int SProcXIQueryPointer(ClientPtr /* client */ ); int ProcXIQueryPointer(ClientPtr /* client */ ); diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h index 824e168a4..e0291454c 100644 --- a/Xi/xiqueryversion.h +++ b/Xi/xiqueryversion.h @@ -24,15 +24,15 @@ * */ +#ifndef QUERYVERSION_H +#define QUERYVERSION_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif #include -#ifndef QUERYVERSION_H -#define QUERYVERSION_H 1 - int SProcXIQueryVersion(ClientPtr client); int ProcXIQueryVersion(ClientPtr client); diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h index f0f0d1c16..56141838a 100644 --- a/Xi/xiselectev.h +++ b/Xi/xiselectev.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XISELECTEVENTS_H +#define XISELECTEVENTS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XISELECTEVENTS_H -#define XISELECTEVENTS_H 1 - int SProcXISelectEvents(ClientPtr client); int ProcXISelectEvents(ClientPtr client); int SProcXIGetSelectedEvents(ClientPtr client); diff --git a/Xi/xisetclientpointer.h b/Xi/xisetclientpointer.h index f5c15bf49..edae43fea 100644 --- a/Xi/xisetclientpointer.h +++ b/Xi/xisetclientpointer.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef SETCPTR_H +#define SETCPTR_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SETCPTR_H -#define SETCPTR_H 1 - int SProcXISetClientPointer(ClientPtr /* client */ ); int ProcXISetClientPointer(ClientPtr /* client */ ); diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h index 68dbe0ee5..1ad377fb3 100644 --- a/Xi/xisetdevfocus.h +++ b/Xi/xisetdevfocus.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer */ +#ifndef XISETDEVFOCUS_H +#define XISETDEVFOCUS_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef XISETDEVFOCUS_H -#define XISETDEVFOCUS_H 1 - int SProcXISetFocus(ClientPtr client); int ProcXISetFocus(ClientPtr client); diff --git a/Xi/xiwarppointer.h b/Xi/xiwarppointer.h index 7637f422a..e488d67ec 100644 --- a/Xi/xiwarppointer.h +++ b/Xi/xiwarppointer.h @@ -23,13 +23,13 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ +#ifndef WARPDEVP_H +#define WARPDEVP_H 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef WARPDEVP_H -#define WARPDEVP_H 1 - int SProcXIWarpPointer(ClientPtr /* client */ ); int ProcXIWarpPointer(ClientPtr /* client */ );