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 <mikedld@mikedld.com>
This commit is contained in:
Mike Gelfand 2025-06-23 21:58:56 +01:00
parent c0757a471f
commit 88693ad15f
No known key found for this signature in database
GPG Key ID: CC4DBBE3299B16F8
51 changed files with 161 additions and 162 deletions

View File

@ -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 <dix-config.h>
#endif
#ifndef ALLOWEV_H
#define ALLOWEV_H 1
int SProcXAllowDeviceEvents(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGDCTL_H
#define CHGDCTL_H 1
int SProcXChangeDeviceControl(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGFCTL_H
#define CHGFCTL_H 1
int SProcXChangeFeedbackControl(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGKBD_H
#define CHGKBD_H 1
int ProcXChangeKeyboardDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGKMAP_H
#define CHGKMAP_H 1
int SProcXChangeDeviceKeyMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGPROP_H
#define CHGPROP_H 1
int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CHGPTR_H
#define CHGPTR_H 1
int ProcXChangePointerDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef CLOSEDEV_H
#define CLOSEDEV_H 1
int ProcXCloseDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef DEVBELL_H
#define DEVBELL_H 1
int ProcXDeviceBell(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#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;

View File

@ -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 <dix-config.h>
#endif
#ifndef GETBMAP_H
#define GETBMAP_H 1
int ProcXGetDeviceButtonMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETDCTL_H
#define GETDCTL_H 1
int SProcXGetDeviceControl(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETFCTL_H
#define GETFCTL_H 1
int ProcXGetFeedbackControl(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETFOCUS_H
#define GETFOCUS_H 1
int ProcXGetDeviceFocus(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETKMAP_H
#define GETKMAP_H 1
int ProcXGetDeviceKeyMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETMMAP_H
#define GETMMAP_H 1
int ProcXGetDeviceModifierMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETPROP_H
#define GETPROP_H 1
int SProcXGetDeviceDontPropagateList(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETSELEV_H
#define GETSELEV_H 1
int SProcXGetSelectedExtensionEvents(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETVERS_H
#define GETVERS_H 1
int SProcXGetExtensionVersion(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GRABDEV_H
#define GRABDEV_H 1
int SProcXGrabDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GRABDEVB_H
#define GRABDEVB_H 1
int SProcXGrabDeviceButton(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GRABDEVK_H
#define GRABDEVK_H 1
int SProcXGrabDeviceKey(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef GTMOTION_H
#define GTMOTION_H 1
int SProcXGetDeviceMotionEvents(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef LISTDEV_H
#define LISTDEV_H 1
#define VPC 20 /* Max # valuators per chunk */
int ProcXListInputDevices(ClientPtr /* client */

View File

@ -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 <dix-config.h>
#endif
#ifndef OPENDEV_H
#define OPENDEV_H 1
int ProcXOpenDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef QUERYST_H
#define QUERYST_H 1
int ProcXQueryDeviceState(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SELECTEV_H
#define SELECTEV_H 1
int SProcXSelectExtensionEvent(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SENDEXEV_H
#define SENDEXEV_H 1
int SProcXSendExtensionEvent(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETBMAP_H
#define SETBMAP_H 1
int ProcXSetDeviceButtonMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETDVAL_H
#define SETDVAL_H 1
int ProcXSetDeviceValuators(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETFOCUS_H
#define SETFOCUS_H 1
int SProcXSetDeviceFocus(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETMMAP_H
#define SETMMAP_H 1
int ProcXSetDeviceModifierMapping(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETMODE_H
#define SETMODE_H 1
int ProcXSetDeviceMode(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef UNGRDEV_H
#define UNGRDEV_H 1
int SProcXUngrabDevice(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef UNGRDEVB_H
#define UNGRDEVB_H 1
int SProcXUngrabDeviceButton(ClientPtr /* client */
);

View File

@ -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 <dix-config.h>
#endif
#ifndef UNGRDEVK_H
#define UNGRDEVK_H 1
int SProcXUngrabDeviceKey(ClientPtr /* client */
);

View File

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

View File

@ -1,11 +1,10 @@
#ifndef _XIBARRIERS_H_
#define _XIBARRIERS_H_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _XIBARRIERS_H_
#define _XIBARRIERS_H_
#include "resource.h"
extern RESTYPE PointerBarrierType;

View File

@ -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 <dix-config.h>
#endif
#ifndef CHDEVCUR_H
#define CHDEVCUR_H 1
int SProcXIChangeCursor(ClientPtr /* client */ );
int ProcXIChangeCursor(ClientPtr /* client */ );

View File

@ -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 <dix-config.h>
#endif
/***********************************************************************
*
* Request change in the device hierarchy.
*
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef CHDEVHIER_H
#define CHDEVHIER_H 1
int ProcXIChangeHierarchy(ClientPtr /* client */ );
void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]);

View File

@ -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 <dix-config.h>
#endif
#ifndef GETCPTR_H
#define GETCPTR_H 1
int SProcXIGetClientPointer(ClientPtr /* client */ );
int ProcXIGetClientPointer(ClientPtr /* client */ );

View File

@ -23,13 +23,13 @@
* Author: Peter Hutterer
*/
#ifndef XIGRABDEV_H
#define XIGRABDEV_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIGRABDEV_H
#define XIGRABDEV_H 1
int ProcXIGrabDevice(ClientPtr client);
int SProcXIGrabDevice(ClientPtr client);

View File

@ -23,13 +23,13 @@
* Author: Peter Hutterer
*/
#ifndef XIPASSIVEGRAB_H
#define XIPASSIVEGRAB_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XIPASSIVEGRAB_H
#define XIPASSIVEGRAB_H 1
int SProcXIPassiveUngrabDevice(ClientPtr client);
int ProcXIPassiveUngrabDevice(ClientPtr client);
int ProcXIPassiveGrabDevice(ClientPtr client);

View File

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

View File

@ -24,13 +24,13 @@
*
*/
#ifndef QUERYDEV_H
#define QUERYDEV_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef QUERYDEV_H
#define QUERYDEV_H 1
#include <X11/extensions/XI2proto.h>
int SProcXIQueryDevice(ClientPtr client);

View File

@ -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 <dix-config.h>
#endif
#ifndef QUERYDP_H
#define QUERYDP_H 1
int SProcXIQueryPointer(ClientPtr /* client */ );
int ProcXIQueryPointer(ClientPtr /* client */ );

View File

@ -24,15 +24,15 @@
*
*/
#ifndef QUERYVERSION_H
#define QUERYVERSION_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <X11/extensions/XI2proto.h>
#ifndef QUERYVERSION_H
#define QUERYVERSION_H 1
int SProcXIQueryVersion(ClientPtr client);
int ProcXIQueryVersion(ClientPtr client);

View File

@ -23,13 +23,13 @@
* Author: Peter Hutterer
*/
#ifndef XISELECTEVENTS_H
#define XISELECTEVENTS_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XISELECTEVENTS_H
#define XISELECTEVENTS_H 1
int SProcXISelectEvents(ClientPtr client);
int ProcXISelectEvents(ClientPtr client);
int SProcXIGetSelectedEvents(ClientPtr client);

View File

@ -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 <dix-config.h>
#endif
#ifndef SETCPTR_H
#define SETCPTR_H 1
int SProcXISetClientPointer(ClientPtr /* client */ );
int ProcXISetClientPointer(ClientPtr /* client */ );

View File

@ -23,13 +23,13 @@
* Author: Peter Hutterer
*/
#ifndef XISETDEVFOCUS_H
#define XISETDEVFOCUS_H 1
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XISETDEVFOCUS_H
#define XISETDEVFOCUS_H 1
int SProcXISetFocus(ClientPtr client);
int ProcXISetFocus(ClientPtr client);

View File

@ -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 <dix-config.h>
#endif
#ifndef WARPDEVP_H
#define WARPDEVP_H 1
int SProcXIWarpPointer(ClientPtr /* client */ );
int ProcXIWarpPointer(ClientPtr /* client */ );