From 4cac1ee46d224fc83b7f7e6fbbf820739f0c1fab Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 4 Sep 2024 15:17:37 +0200 Subject: [PATCH] dix: drop unnecessary check on HAVE_DIX_CONFIG_H The dix-config.h include file is always present, so no need for an extra check and conditional include. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/atom.c | 2 -- dix/color.c | 2 -- dix/colormap.c | 2 -- dix/cursor.c | 2 -- dix/devices.c | 2 -- dix/dispatch.c | 2 -- dix/dispatch.h | 2 -- dix/dixfonts.c | 2 -- dix/dixutils.c | 2 -- dix/enterleave.c | 2 -- dix/enterleave.h | 2 -- dix/eventconvert.c | 2 -- dix/events.c | 2 -- dix/extension.c | 2 -- dix/gc.c | 2 -- dix/gestures.c | 2 -- dix/getevents.c | 2 -- dix/globals.c | 2 -- dix/glyphcurs.c | 2 -- dix/grabs.c | 2 -- dix/initatoms.c | 2 -- dix/inpututils.c | 2 -- dix/main.c | 2 -- dix/pixmap.c | 2 -- dix/privates.c | 2 -- dix/property.c | 2 -- dix/ptrveloc.c | 2 -- dix/region.c | 2 -- dix/registry.c | 2 -- dix/resource.c | 2 -- dix/selection.c | 2 -- dix/swaprep.c | 2 -- dix/swapreq.c | 2 -- dix/tables.c | 2 -- dix/touch.c | 2 -- dix/window.c | 2 -- 36 files changed, 72 deletions(-) diff --git a/dix/atom.c b/dix/atom.c index da0adfe78..f0e6e2dc8 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/color.c b/dix/color.c index 8252e2e88..ead707383 100644 --- a/dix/color.c +++ b/dix/color.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/dix/colormap.c b/dix/colormap.c index 8dbeed4dc..10c84d5b6 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/cursor.c b/dix/cursor.c index 2e202036d..e3774f7be 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/devices.c b/dix/devices.c index d93429e86..5876ea459 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -44,9 +44,7 @@ SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/dispatch.c b/dix/dispatch.c index 6810c1924..4200971f8 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -96,10 +96,8 @@ Equipment Corporation. * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include #include -#endif #include #include diff --git a/dix/dispatch.h b/dix/dispatch.h index 939a6b936..9d68a0727 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -29,9 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * extension.c, property.c. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifndef DISPATCH_H #define DISPATCH_H 1 diff --git a/dix/dixfonts.c b/dix/dixfonts.c index ec0c41c76..d91c60ac9 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -48,9 +48,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/dixutils.c b/dix/dixutils.c index 9a950c6f2..3b98ced0e 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -80,9 +80,7 @@ Author: Adobe Systems Incorporated */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/enterleave.c b/dix/enterleave.c index f12e8e1ed..2e7a64195 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/enterleave.h b/dix/enterleave.h index e8af924c6..b6341ff68 100644 --- a/dix/enterleave.h +++ b/dix/enterleave.h @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifndef ENTERLEAVE_H #define ENTERLEAVE_H diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 6abd86836..62b111441 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -28,9 +28,7 @@ * matching protocol events. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/events.c b/dix/events.c index 983ce739b..6b61a8c29 100644 --- a/dix/events.c +++ b/dix/events.c @@ -101,9 +101,7 @@ Equipment Corporation. * handling (the parts for input devices). */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/extension.c b/dix/extension.c index d67cd52dd..fd1439957 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/gc.c b/dix/gc.c index a546d3dfa..16293b318 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/gestures.c b/dix/gestures.c index fb4afb629..ff9631460 100644 --- a/dix/gestures.c +++ b/dix/gestures.c @@ -23,9 +23,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "dix/eventconvert.h" diff --git a/dix/getevents.c b/dix/getevents.c index 19170f4a5..66f3e19aa 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -27,9 +27,7 @@ * Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/globals.c b/dix/globals.c index 86312b9ee..5baee0af6 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -44,9 +44,7 @@ SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c index 879279269..012af910e 100644 --- a/dix/glyphcurs.c +++ b/dix/glyphcurs.c @@ -44,9 +44,7 @@ SOFTWARE. ************************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/cursor_priv.h" diff --git a/dix/grabs.c b/dix/grabs.c index 4e63e7203..fb768b06c 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -45,9 +45,7 @@ SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/initatoms.c b/dix/initatoms.c index bcc38a0f1..931f03439 100644 --- a/dix/initatoms.c +++ b/dix/initatoms.c @@ -3,9 +3,7 @@ * Do not change! Changing this file implies a protocol change! */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/inpututils.c b/dix/inpututils.c index ac23ad103..f6b383ebc 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -23,9 +23,7 @@ * Author: Daniel Stone */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include "dix/exevents_priv.h" #include "dix/input_priv.h" diff --git a/dix/main.c b/dix/main.c index 65ce34aa2..8117ea8e5 100644 --- a/dix/main.c +++ b/dix/main.c @@ -73,10 +73,8 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include #include -#endif #include #include diff --git a/dix/pixmap.c b/dix/pixmap.c index 926adad37..3324f947b 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "scrnintstr.h" diff --git a/dix/privates.c b/dix/privates.c index ffa77347b..62309d769 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -48,9 +48,7 @@ from The Open Group. * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "windowstr.h" diff --git a/dix/property.c b/dix/property.c index 501c54698..e5e579f95 100644 --- a/dix/property.c +++ b/dix/property.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index ee5a24c9e..192c0f5bb 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/dix/region.c b/dix/region.c index 5c83f8a04..00c804ea2 100644 --- a/dix/region.c +++ b/dix/region.c @@ -75,9 +75,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "regionstr.h" #include diff --git a/dix/registry.c b/dix/registry.c index e04a26727..c37dbce5d 100644 --- a/dix/registry.c +++ b/dix/registry.c @@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/resource.c b/dix/resource.c index ffaf1d29d..e68e60f8d 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -117,9 +117,7 @@ Equipment Corporation. * resource "owned" by the client. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/dix/selection.c b/dix/selection.c index f0ca73624..ec9b4e85b 100644 --- a/dix/selection.c +++ b/dix/selection.c @@ -44,9 +44,7 @@ SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index d785b2e5e..b9afa14a2 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -44,9 +44,7 @@ SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/swapreq.c b/dix/swapreq.c index 67850593b..7f6b057a4 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -44,9 +44,7 @@ SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/tables.c b/dix/tables.c index 88b372eb7..8f0c7634f 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dix/touch.c b/dix/touch.c index be7677485..f48fe1406 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -24,9 +24,7 @@ * Author: Daniel Stone */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "dix/eventconvert.h" diff --git a/dix/window.c b/dix/window.c index 9211c6964..500582b9c 100644 --- a/dix/window.c +++ b/dix/window.c @@ -96,9 +96,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/colormap_priv.h" #include "dix/cursor_priv.h"