diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index 49c2f647d..9994e5103 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,10 +1,10 @@ /* Prototypes for functions that the DDX must provide */ -#include - #ifndef _DPMSPROC_H_ #define _DPMSPROC_H_ +#include + #include "dixstruct.h" extern int DPMSSet(ClientPtr client, int level); diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 8b46ef344..6db760aa3 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -28,21 +28,21 @@ Equipment Corporation. /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ -/* - * PanoramiX definitions - */ - -#include - #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ +#include + #include #include #include "gcstruct.h" #include "dixstruct.h" +/* + * PanoramiX definitions + */ + typedef struct _PanoramiXInfo { XID id; } PanoramiXInfo; diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 8eea4831f..fbccd2cd0 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,9 +1,8 @@ - -#include - #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ +#include + #include "panoramiX.h" extern int PanoramiXNumScreens; diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h index ff5cc3364..037278d73 100644 --- a/Xext/sleepuntil.h +++ b/Xext/sleepuntil.h @@ -24,11 +24,11 @@ * XFree86 Project. */ -#include - #ifndef _SLEEPUNTIL_H_ #define _SLEEPUNTIL_H_ 1 +#include + #include "dix.h" extern int ClientSleepUntil(ClientPtr client, 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 */ ); diff --git a/composite/compint.h b/composite/compint.h index 3a91914f9..bb05c3d80 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -41,13 +41,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _COMPINT_H_ +#define _COMPINT_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _COMPINT_H_ -#define _COMPINT_H_ - #include "dix/screen_hooks_priv.h" #include "misc.h" diff --git a/composite/compositeext.h b/composite/compositeext.h index 945a4c35c..ae579edf2 100644 --- a/composite/compositeext.h +++ b/composite/compositeext.h @@ -21,13 +21,13 @@ * SOFTWARE. */ +#ifndef _COMPOSITEEXT_H_ +#define _COMPOSITEEXT_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _COMPOSITEEXT_H_ -#define _COMPOSITEEXT_H_ - #include "misc.h" #include "scrnintstr.h" diff --git a/damageext/damageextint.h b/damageext/damageextint.h index a7e521dd6..b9bf25c1c 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -20,13 +20,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _DAMAGEEXTINT_H_ +#define _DAMAGEEXTINT_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _DAMAGEEXTINT_H_ -#define _DAMAGEEXTINT_H_ - #include #include #include diff --git a/dbe/midbe.h b/dbe/midbe.h index 019375756..1775df181 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -29,13 +29,13 @@ * *****************************************************************************/ +#ifndef MIDBE_H +#define MIDBE_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef MIDBE_H -#define MIDBE_H - #include "dix/screen_hooks_priv.h" #include "include/privates.h" diff --git a/dix/dispatch.h b/dix/dispatch.h index 9d68a0727..62534d491 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -23,17 +23,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifndef DISPATCH_H +#define DISPATCH_H 1 + +#include + /* * This prototypes the dispatch.c module (except for functions declared in * global headers), plus related dispatch procedures from devices.c, events.c, * extension.c, property.c. */ -#include - -#ifndef DISPATCH_H -#define DISPATCH_H 1 - int ProcAllocColor(ClientPtr /* client */ ); int ProcAllocColorCells(ClientPtr /* client */ ); int ProcAllocColorPlanes(ClientPtr /* client */ ); diff --git a/dix/enterleave.h b/dix/enterleave.h index b6341ff68..d8d5ab6d6 100644 --- a/dix/enterleave.h +++ b/dix/enterleave.h @@ -24,11 +24,11 @@ * */ -#include - #ifndef ENTERLEAVE_H #define ENTERLEAVE_H +#include + #include /* DoFocusEvents() */ extern void DoEnterLeaveEvents(DeviceIntPtr pDev, diff --git a/fb/fbpict.h b/fb/fbpict.h index eb627c15f..58edd98c0 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -21,13 +21,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _FBPICT_H_ +#define _FBPICT_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _FBPICT_H_ -#define _FBPICT_H_ - #include "fb.h" /* fbpict.c */ diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index a64f4dea7..56ac69820 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -25,13 +25,13 @@ * */ +#ifndef __GLAMOR_UTILS_H__ +#define __GLAMOR_UTILS_H__ + #ifndef GLAMOR_PRIV_H #error This file can only be included by glamor_priv.h #endif -#ifndef __GLAMOR_UTILS_H__ -#define __GLAMOR_UTILS_H__ - #include "os/bug_priv.h" #include "glamor_prepare.h" diff --git a/glx/glxcontext.h b/glx/glxcontext.h index 5dd0ebca6..9c52eefe7 100644 --- a/glx/glxcontext.h +++ b/glx/glxcontext.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _GLX_context_h_ -#define _GLX_context_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _GLX_context_h_ +#define _GLX_context_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + struct __GLXcontext { void (*destroy) (__GLXcontext * context); int (*makeCurrent) (__GLXcontext * context); diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h index 441d72dd7..f9e7f281a 100644 --- a/glx/glxdrawable.h +++ b/glx/glxdrawable.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _GLX_drawable_h_ -#define _GLX_drawable_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _GLX_drawable_h_ +#define _GLX_drawable_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + /* We just need to avoid clashing with DRAWABLE_{WINDOW,PIXMAP} */ enum { GLX_DRAWABLE_WINDOW, diff --git a/glx/glxext.h b/glx/glxext.h index abaf1225c..179d5daf9 100644 --- a/glx/glxext.h +++ b/glx/glxext.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _glxext_h_ -#define _glxext_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _glxext_h_ +#define _glxext_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + /* doing #include & #include could cause problems * with overlapping definitions, so let's use the easy way */ diff --git a/glx/glxscreens.h b/glx/glxscreens.h index 02170b0c6..1412f1114 100644 --- a/glx/glxscreens.h +++ b/glx/glxscreens.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _GLX_screens_h_ -#define _GLX_screens_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _GLX_screens_h_ +#define _GLX_screens_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #include "extension_string.h" #include "glxvndabi.h" diff --git a/glx/glxserver.h b/glx/glxserver.h index 79f4944d0..c134d62c5 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _GLX_server_h_ -#define _GLX_server_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _GLX_server_h_ +#define _GLX_server_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #include #include #include diff --git a/glx/glxutil.h b/glx/glxutil.h index 314606da2..27dd49a18 100644 --- a/glx/glxutil.h +++ b/glx/glxutil.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _glxcmds_h_ -#define _glxcmds_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _glxcmds_h_ +#define _glxcmds_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + extern GLboolean __glXDrawableInit(__GLXdrawable * drawable, __GLXscreen * screen, DrawablePtr pDraw, int type, XID drawID, diff --git a/glx/singlesize.h b/glx/singlesize.h index dc85d3d36..3f9930c22 100644 --- a/glx/singlesize.h +++ b/glx/singlesize.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _singlesize_h_ -#define _singlesize_h_ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef _singlesize_h_ +#define _singlesize_h_ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #include "indirect_size.h" extern GLint __glReadPixels_size(GLenum format, GLenum type, diff --git a/glx/unpack.h b/glx/unpack.h index 256073470..44a7975da 100644 --- a/glx/unpack.h +++ b/glx/unpack.h @@ -1,10 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef __GLX_unpack_h__ -#define __GLX_unpack_h__ - /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. @@ -35,6 +28,13 @@ * Silicon Graphics, Inc. */ +#ifndef __GLX_unpack_h__ +#define __GLX_unpack_h__ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #define __GLX_PAD(s) (((s)+3) & (GLuint)~3) /* diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index 5072cb9ec..79b40a193 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -31,13 +31,13 @@ * video drivers must not include this file. */ +#ifndef _XF86_BUS_H +#define _XF86_BUS_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _XF86_BUS_H -#define _XF86_BUS_H - #include "xf86pciBus.h" #if defined(__sparc__) || defined(__sparc) #include "xf86sbusBus.h" diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index a14913eb2..f467f55e5 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1997-2000 by The XFree86 Project, Inc. * @@ -26,13 +25,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _xf86_config_h +#define _xf86_config_h + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _xf86_config_h -#define _xf86_config_h - #include "xf86Optrec.h" #include "xf86Parser.h" #include "xf86str.h" diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index b8229d2c1..3a84a5d79 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999 by The XFree86 Project, Inc. * @@ -26,13 +25,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _xf86InPriv_h +#define _xf86InPriv_h + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _xf86InPriv_h -#define _xf86InPriv_h - /* xf86Globals.c */ extern InputDriverPtr *xf86InputDriverList; extern int xf86NumInputDrivers; diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index 14ae9760e..41557c09b 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * @@ -26,13 +25,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _XF86_PCI_BUS_H +#define _XF86_PCI_BUS_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _XF86_PCI_BUS_H -#define _XF86_PCI_BUS_H - #include "xf86MatchDrivers.h" void xf86PciProbe(void); diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 6ca55405d..23c501e8b 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -31,15 +31,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* Prototypes for DRI functions */ - #ifndef _DRI_H_ +#define _DRI_H_ #include #include "scrnintstr.h" #include "xf86dri.h" +/* Prototypes for DRI functions */ + typedef int DRISyncType; #define DRI_NO_SYNC 0 @@ -333,6 +334,4 @@ extern _X_EXPORT void DRIGetTexOffsetFuncs(ScreenPtr pScreen, DRITexOffsetFinishProcPtr * texOffsetFinishFunc); -#define _DRI_H_ - #endif diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index 8d224ae02..47c3764a5 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -3,13 +3,13 @@ * removed internal stuff (#ifdef __KERNEL__) */ +#ifndef _LINUX_FB_H +#define _LINUX_FB_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _LINUX_FB_H -#define _LINUX_FB_H - #include /* Definitions of frame buffers */ diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index 4af2dafb7..973d852e1 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -3,12 +3,14 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ + +#ifndef XF86X86EMU_H_ +#define XF86X86EMU_H_ + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef XF86X86EMU_H_ -#define XF86X86EMU_H_ #include #define M _X86EMU_env diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index 4e83730a2..98164c1cc 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -46,13 +46,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _LOADER_H +#define _LOADER_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _LOADER_H -#define _LOADER_H - #include #include #include diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index 8b16cb7ea..fb7aa544f 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -46,13 +46,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _LOADERPROCS_H +#define _LOADERPROCS_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _LOADERPROCS_H -#define _LOADERPROCS_H - #include "xf86Module.h" typedef struct module_desc { diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 49d5627f1..ce1edc06d 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -2,13 +2,13 @@ * Memory range attribute operations, performed on /dev/mem */ +#ifndef _MEMRANGE_H +#define _MEMRANGE_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _MEMRANGE_H -#define _MEMRANGE_H - /* Memory range attributes */ #define MDF_UNCACHEABLE (1<<0) /* region not cached */ #define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 5e11cf3df..c344ca198 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -99,13 +99,14 @@ * This file has the private Pci definitions. The public ones are imported * from xf86Pci.h. Drivers should not use this file. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif #ifndef _PCI_H #define _PCI_H 1 +#ifdef HAVE_XORG_CONFIG_H +#include +#endif + #include #include "xf86Pci.h" diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index d702e4e6c..91d2376e0 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -21,13 +21,13 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef _XF86_SBUS_H +#define _XF86_SBUS_H + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _XF86_SBUS_H -#define _XF86_SBUS_H - #if defined(__linux__) #include #include diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h index d942fbdad..e6d214be7 100644 --- a/hw/xfree86/os-support/int10Defines.h +++ b/hw/xfree86/os-support/int10Defines.h @@ -25,13 +25,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _INT10DEFINES_H_ +#define _INT10DEFINES_H_ 1 + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _INT10DEFINES_H_ -#define _INT10DEFINES_H_ 1 - #ifdef _VM86_LINUX #include diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index 0a8e4feee..12b36effd 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -57,13 +57,13 @@ * they should not be visible outside of the parser. */ +#ifndef _Configint_h_ +#define _Configint_h_ + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _Configint_h_ -#define _Configint_h_ - #include #include #include diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index dfa907989..9e9855558 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -56,12 +56,14 @@ * This file contains the Option Record that is passed between the Parser, * and Module setup procs. */ + +#ifndef _xf86Optrec_h_ +#define _xf86Optrec_h_ + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _xf86Optrec_h_ -#define _xf86Optrec_h_ #include #include #include "xf86Optionstr.h" diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index b9240af12..1822a4d61 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -56,13 +56,14 @@ * This file contains the external interfaces for the XFree86 configuration * file parser. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif #ifndef _xf86Parser_h_ #define _xf86Parser_h_ +#ifdef HAVE_XORG_CONFIG_H +#include +#endif + #include #include "xf86Optrec.h" #include "list.h" diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 11d0fa041..4176536ca 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -52,13 +52,13 @@ * authorization from the copyright holder(s) and author(s). */ +#ifndef _xf86_tokens_h +#define _xf86_tokens_h + #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _xf86_tokens_h -#define _xf86_tokens_h - /* * Each token should have a unique value regardless of the section * it is used in. diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index cb8669733..268ccc5a9 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,11 +1,10 @@ +#ifndef _XF86CURSORPRIV_H +#define _XF86CURSORPRIV_H #ifdef HAVE_XORG_CONFIG_H #include #endif -#ifndef _XF86CURSORPRIV_H -#define _XF86CURSORPRIV_H - #include "xf86Cursor.h" #include "mipointrst.h" diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index 720fa5a9c..dc1f3cac5 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,9 +1,10 @@ +#ifndef __XWIN_DDRAW_H +#define __XWIN_DDRAW_H + #ifdef __MINGW64_VERSION_MAJOR #include_next #define __XWIN_DDRAW_H #endif -#ifndef __XWIN_DDRAW_H -#define __XWIN_DDRAW_H #include #include diff --git a/include/displaymode.h b/include/displaymode.h index 561087717..9b6012604 100644 --- a/include/displaymode.h +++ b/include/displaymode.h @@ -1,10 +1,10 @@ +#ifndef _DISMODEPROC_H_ +#define _DISMODEPROC_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _DISMODEPROC_H_ -#define _DISMODEPROC_H_ - #include "scrnintstr.h" #define MAXCLOCKS 128 diff --git a/include/inpututils.h b/include/inpututils.h index 49b1c1074..0c9217cfe 100644 --- a/include/inpututils.h +++ b/include/inpututils.h @@ -22,13 +22,13 @@ * */ +#ifndef INPUTUTILS_H +#define INPUTUTILS_H + #ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" #endif -#ifndef INPUTUTILS_H -#define INPUTUTILS_H - #include "input.h" #include "eventstr.h" #include diff --git a/include/vidmodestr.h b/include/vidmodestr.h index b47daa779..67a018959 100644 --- a/include/vidmodestr.h +++ b/include/vidmodestr.h @@ -1,10 +1,10 @@ +#ifndef _VIDMODEPROC_H_ +#define _VIDMODEPROC_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _VIDMODEPROC_H_ -#define _VIDMODEPROC_H_ - #include "displaymode.h" typedef enum { diff --git a/mi/miinitext.h b/mi/miinitext.h index a1ceb9aa8..3581ea7b4 100644 --- a/mi/miinitext.h +++ b/mi/miinitext.h @@ -71,13 +71,13 @@ SOFTWARE. * authorization from the copyright holder(s) and author(s). */ +#ifndef MIINITEXT_H +#define MIINITEXT_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef MIINITEXT_H -#define MIINITEXT_H - void ListStaticExtensions(void); #endif /* MIINITEXT_H */ diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 420a846c2..1514e51b4 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,11 +1,10 @@ +#ifndef __MIOVERLAY_H +#define __MIOVERLAY_H #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef __MIOVERLAY_H -#define __MIOVERLAY_H - typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr); typedef Bool (*miOverlayInOverlayFunc) (WindowPtr); diff --git a/mi/miscanfill.h b/mi/miscanfill.h index 7fba199de..5918e8b58 100644 --- a/mi/miscanfill.h +++ b/mi/miscanfill.h @@ -26,12 +26,13 @@ from The Open Group. */ +#ifndef SCANFILLINCLUDED +#define SCANFILLINCLUDED + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef SCANFILLINCLUDED -#define SCANFILLINCLUDED /* * scanfill.h * diff --git a/mi/mivalidate.h b/mi/mivalidate.h index 4c64ab34e..b90f871ae 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -26,13 +26,13 @@ from The Open Group. */ +#ifndef MIVALIDATE_H +#define MIVALIDATE_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef MIVALIDATE_H -#define MIVALIDATE_H - #include "regionstr.h" typedef union _Validate { diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 525b2db5d..408161e66 100644 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -20,13 +20,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _DAMAGE_H_ +#define _DAMAGE_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _DAMAGE_H_ -#define _DAMAGE_H_ - typedef struct _damage *DamagePtr; typedef enum _damageReportLevel { diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 5517d24e0..ade651c39 100644 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -20,13 +20,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _DAMAGESTR_H_ +#define _DAMAGESTR_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _DAMAGESTR_H_ -#define _DAMAGESTR_H_ - #include "damage.h" #include "gcstruct.h" #include "privates.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index b375731bf..74245eb35 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -28,13 +28,13 @@ * use or other dealings in this Software without prior written authorization. */ +#ifndef _ROOTLESS_H +#define _ROOTLESS_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _ROOTLESS_H -#define _ROOTLESS_H - #include "rootlessConfig.h" #include "mi.h" #include "gcstruct.h" diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index 9fdb98e40..8ed52f730 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -28,13 +28,14 @@ * use or other dealings in this Software without prior written authorization. */ +#ifndef _ROOTLESSCOMMON_H +#define _ROOTLESSCOMMON_H + #ifdef HAVE_DIX_CONFIG_H #include #endif #include -#ifndef _ROOTLESSCOMMON_H -#define _ROOTLESSCOMMON_H #include "misc.h" #include "rootless.h" diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 80c2f6d8a..7d8a19c92 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -27,13 +27,13 @@ * use or other dealings in this Software without prior written authorization. */ +#ifndef _ROOTLESSCONFIG_H +#define _ROOTLESSCONFIG_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _ROOTLESSCONFIG_H -#define _ROOTLESSCONFIG_H - /*# define ROOTLESSDEBUG*/ #define ROOTLESS_PROTECT_ALPHA TRUE diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 00e95b8a0..5dd360a0e 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -27,13 +27,13 @@ * use or other dealings in this Software without prior written authorization. */ +#ifndef _ROOTLESSWINDOW_H +#define _ROOTLESSWINDOW_H + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _ROOTLESSWINDOW_H -#define _ROOTLESSWINDOW_H - #include "dix/screen_hooks_priv.h" #include "rootlessCommon.h" diff --git a/miext/sync/misync.h b/miext/sync/misync.h index 4748fa4ae..b247259b3 100644 --- a/miext/sync/misync.h +++ b/miext/sync/misync.h @@ -21,13 +21,13 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef _MISYNC_H_ +#define _MISYNC_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _MISYNC_H_ -#define _MISYNC_H_ - typedef struct _SyncObject SyncObject; typedef struct _SyncFence SyncFence; typedef struct _SyncTrigger SyncTrigger; diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index 21cb0b257..4465b0c3c 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -21,13 +21,13 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef _MISYNCSTR_H_ +#define _MISYNCSTR_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _MISYNCSTR_H_ -#define _MISYNCSTR_H_ - #include #include "dix.h" #include "misync.h" diff --git a/os/osdep.h b/os/osdep.h index ff41f2482..de9ac6ba2 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -44,13 +44,13 @@ SOFTWARE. ******************************************************************/ +#ifndef _OSDEP_H_ +#define _OSDEP_H_ 1 + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _OSDEP_H_ -#define _OSDEP_H_ 1 - #include #if defined(XDMCP) || defined(HASXDMAUTH) diff --git a/randr/randrstr.h b/randr/randrstr.h index 658edc453..1d22e0431 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -26,13 +26,13 @@ * Keith Packard, Intel Corporation */ +#ifndef _RANDRSTR_H_ +#define _RANDRSTR_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _RANDRSTR_H_ -#define _RANDRSTR_H_ - #include #include #include "misc.h" diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h index 88c0bc864..51b3473dc 100644 --- a/test/xi2/protocol-common.h +++ b/test/xi2/protocol-common.h @@ -21,6 +21,9 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef PROTOCOL_COMMON_H +#define PROTOCOL_COMMON_H + #ifdef HAVE_DIX_CONFIG_H #include #endif @@ -34,9 +37,6 @@ #include "tests.h" -#ifndef PROTOCOL_COMMON_H -#define PROTOCOL_COMMON_H - /* Check default values in a reply */ #define reply_check_defaults(rep, len, type) \ { \ diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h index 23f31cde4..31f0e1316 100644 --- a/xfixes/xfixes.h +++ b/xfixes/xfixes.h @@ -20,13 +20,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _XFIXES_H_ +#define _XFIXES_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _XFIXES_H_ -#define _XFIXES_H_ - #include "resource.h" extern RESTYPE RegionResType; diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 6e606d00a..0f6e87931 100644 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -42,13 +42,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef _XFIXESINT_H_ +#define _XFIXESINT_H_ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef _XFIXESINT_H_ -#define _XFIXESINT_H_ - #include #include #include diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index b02dff9de..e05408167 100644 --- a/xkb/xkbDflts.h +++ b/xkb/xkbDflts.h @@ -1,12 +1,13 @@ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif #ifndef DEFAULT_H #define DEFAULT_H 1 +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #define GET_ATOM(d,s) MakeAtom(s,strlen(s),1) #define DPYTYPE char * #define NUM_KEYS 1