From 969be9e43ef44e02cd0d1664688d3dbd0b5e0180 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 17 Dec 2025 20:04:37 +0100 Subject: [PATCH] drop obsolete #ifdef HAVE_CONFIG_H the config.h file is always present Signed-off-by: Enrico Weigelt, metux IT consult --- benchmarks/dri2-swap.c | 3 --- benchmarks/dri3-swap.c | 3 --- src/backlight.c | 3 --- src/fd.c | 3 --- src/intel_device.c | 3 --- src/intel_module.c | 3 --- src/intel_options.c | 2 -- src/legacy/i810/i810_accel.c | 3 --- src/legacy/i810/i810_cursor.c | 3 --- src/legacy/i810/i810_dga.c | 3 --- src/legacy/i810/i810_dri.c | 2 -- src/legacy/i810/i810_driver.c | 3 --- src/legacy/i810/i810_hwmc.c | 3 --- src/legacy/i810/i810_memory.c | 3 --- src/legacy/i810/i810_video.c | 3 --- src/legacy/i810/i810_wmark.c | 3 --- src/sna/blt.c | 3 --- src/sna/brw/brw_eu.c | 3 --- src/sna/gen2_render.c | 3 --- src/sna/gen3_render.c | 3 --- src/sna/gen4_common.c | 3 --- src/sna/gen4_render.c | 3 --- src/sna/gen4_source.c | 3 --- src/sna/gen4_vertex.c | 3 --- src/sna/gen5_render.c | 3 --- src/sna/gen6_common.c | 3 --- src/sna/gen6_render.c | 3 --- src/sna/gen7_render.c | 3 --- src/sna/gen8_eu.c | 3 --- src/sna/gen8_render.c | 3 --- src/sna/gen8_vertex.c | 3 --- src/sna/gen9_render.c | 3 --- src/sna/kgem.c | 3 --- src/sna/kgem_debug.c | 3 --- src/sna/kgem_debug_gen2.c | 3 --- src/sna/kgem_debug_gen3.c | 3 --- src/sna/kgem_debug_gen4.c | 3 --- src/sna/kgem_debug_gen5.c | 3 --- src/sna/kgem_debug_gen6.c | 3 --- src/sna/kgem_debug_gen7.c | 3 --- src/sna/sna_accel.c | 3 --- src/sna/sna_acpi.c | 3 --- src/sna/sna_blt.c | 3 --- src/sna/sna_composite.c | 3 --- src/sna/sna_cpu.c | 3 --- src/sna/sna_damage.c | 3 --- src/sna/sna_display.c | 3 --- src/sna/sna_display_fake.c | 3 --- src/sna/sna_dri2.c | 3 --- src/sna/sna_dri3.c | 3 --- src/sna/sna_driver.c | 3 --- src/sna/sna_glyphs.c | 3 --- src/sna/sna_gradient.c | 3 --- src/sna/sna_io.c | 3 --- src/sna/sna_present.c | 3 --- src/sna/sna_render.c | 3 --- src/sna/sna_stream.c | 3 --- src/sna/sna_threads.c | 3 --- src/sna/sna_tiling.c | 3 --- src/sna/sna_transform.c | 3 --- src/sna/sna_trapezoids.c | 3 --- src/sna/sna_trapezoids_boxes.c | 3 --- src/sna/sna_trapezoids_imprecise.c | 3 --- src/sna/sna_trapezoids_mono.c | 3 --- src/sna/sna_trapezoids_precise.c | 3 --- src/sna/sna_vertex.c | 3 --- src/sna/sna_video.c | 3 --- src/sna/sna_video_hwmc.c | 2 -- src/sna/sna_video_overlay.c | 3 --- src/sna/sna_video_sprite.c | 3 --- src/sna/sna_video_textured.c | 2 -- src/uxa/i830_3d.c | 2 -- src/uxa/i830_render.c | 3 --- src/uxa/i915_3d.c | 3 --- src/uxa/i915_render.c | 3 --- src/uxa/i915_video.c | 3 --- src/uxa/i965_3d.c | 3 --- src/uxa/i965_render.c | 3 --- src/uxa/i965_video.c | 3 --- src/uxa/intel.h | 3 --- src/uxa/intel_batchbuffer.c | 3 --- src/uxa/intel_display.c | 3 --- src/uxa/intel_dri.c | 3 --- src/uxa/intel_dri3.c | 3 --- src/uxa/intel_driver.c | 3 --- src/uxa/intel_hwmc.c | 2 -- src/uxa/intel_memory.c | 3 --- src/uxa/intel_present.c | 3 --- src/uxa/intel_uxa.c | 3 --- src/uxa/intel_uxa_video.c | 3 --- src/uxa/intel_video.c | 3 --- src/uxa/intel_video_overlay.c | 3 --- src/uxa/uxa-accel.c | 3 --- src/uxa/uxa-glyphs.c | 4 ---- src/uxa/uxa-priv.h | 8 +------- src/uxa/uxa-render.c | 5 ----- src/uxa/uxa.c | 5 ----- test/cursor-test.c | 3 --- test/dri2-speed.c | 3 --- test/dri3-test.c | 3 --- test/lowlevel-blt-bench.c | 3 --- test/present-race.c | 3 --- test/present-speed.c | 3 --- test/present-test.c | 3 --- test/shm-test.c | 3 --- tools/backlight_helper.c | 2 -- tools/cursor.c | 3 --- tools/virtual.c | 3 --- 108 files changed, 1 insertion(+), 326 deletions(-) diff --git a/benchmarks/dri2-swap.c b/benchmarks/dri2-swap.c index 3d9d30aa..30aeb561 100644 --- a/benchmarks/dri2-swap.c +++ b/benchmarks/dri2-swap.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/benchmarks/dri3-swap.c b/benchmarks/dri3-swap.c index fa8ec34e..e535201b 100644 --- a/benchmarks/dri3-swap.c +++ b/benchmarks/dri3-swap.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/backlight.c b/src/backlight.c index 1dd8f8d7..59304981 100644 --- a/src/backlight.c +++ b/src/backlight.c @@ -24,10 +24,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/fd.c b/src/fd.c index 2ef1550e..1df65d9b 100644 --- a/src/fd.c +++ b/src/fd.c @@ -23,10 +23,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/intel_device.c b/src/intel_device.c index 2ce2e9ad..edcf8512 100644 --- a/src/intel_device.c +++ b/src/intel_device.c @@ -23,10 +23,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/intel_module.c b/src/intel_module.c index 94fca367..6eeddca3 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -23,10 +23,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/intel_options.c b/src/intel_options.c index b531f40a..423c3995 100644 --- a/src/intel_options.c +++ b/src/intel_options.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/legacy/i810/i810_accel.c b/src/legacy/i810/i810_accel.c index f267fde6..ed80512d 100644 --- a/src/legacy/i810/i810_accel.c +++ b/src/legacy/i810/i810_accel.c @@ -25,10 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * Authors: diff --git a/src/legacy/i810/i810_cursor.c b/src/legacy/i810/i810_cursor.c index 98cc36a0..39463eb2 100644 --- a/src/legacy/i810/i810_cursor.c +++ b/src/legacy/i810/i810_cursor.c @@ -25,10 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * Authors: diff --git a/src/legacy/i810/i810_dga.c b/src/legacy/i810/i810_dga.c index d09af9fb..56c3855b 100644 --- a/src/legacy/i810/i810_dga.c +++ b/src/legacy/i810/i810_dga.c @@ -21,10 +21,7 @@ * * Authors: Alan Hourihane, */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c index 36375031..24b4f872 100644 --- a/src/legacy/i810/i810_dri.c +++ b/src/legacy/i810/i810_dri.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c index 6145a103..4f6f08ff 100644 --- a/src/legacy/i810/i810_driver.c +++ b/src/legacy/i810/i810_driver.c @@ -25,10 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * Authors: diff --git a/src/legacy/i810/i810_hwmc.c b/src/legacy/i810/i810_hwmc.c index 58661b0a..b1eb9a64 100644 --- a/src/legacy/i810/i810_hwmc.c +++ b/src/legacy/i810/i810_hwmc.c @@ -32,10 +32,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/legacy/i810/i810_memory.c b/src/legacy/i810/i810_memory.c index 6f274836..57d4a13d 100644 --- a/src/legacy/i810/i810_memory.c +++ b/src/legacy/i810/i810_memory.c @@ -24,10 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * Authors: diff --git a/src/legacy/i810/i810_video.c b/src/legacy/i810/i810_video.c index af683c81..c56ea4c3 100644 --- a/src/legacy/i810/i810_video.c +++ b/src/legacy/i810/i810_video.c @@ -32,10 +32,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Offscreen Images: * Matt Sottek */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/legacy/i810/i810_wmark.c b/src/legacy/i810/i810_wmark.c index 161f0512..8df5e97a 100644 --- a/src/legacy/i810/i810_wmark.c +++ b/src/legacy/i810/i810_wmark.c @@ -29,10 +29,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Keith Whitwell */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/sna/blt.c b/src/sna/blt.c index 803c5142..1033486b 100644 --- a/src/sna/blt.c +++ b/src/sna/blt.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include diff --git a/src/sna/brw/brw_eu.c b/src/sna/brw/brw_eu.c index c5705f56..3af3866f 100644 --- a/src/sna/brw/brw_eu.c +++ b/src/sna/brw/brw_eu.c @@ -28,10 +28,7 @@ * Authors: * Keith Whitwell */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "brw_eu.h" diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c index 80f68454..74f224e9 100644 --- a/src/sna/gen2_render.c +++ b/src/sna/gen2_render.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 8888dd4b..f1a34148 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/gen4_common.c b/src/sna/gen4_common.c index f3d36c3b..a490e23b 100644 --- a/src/sna/gen4_common.c +++ b/src/sna/gen4_common.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gen4_common.h" #include "gen4_vertex.h" diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c index 6403a487..023b4663 100644 --- a/src/sna/gen4_render.c +++ b/src/sna/gen4_render.c @@ -29,10 +29,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen4_source.c b/src/sna/gen4_source.c index 749de8d6..16a6185b 100644 --- a/src/sna/gen4_source.c +++ b/src/sna/gen4_source.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/gen4_vertex.c b/src/sna/gen4_vertex.c index 7d757298..eeb90352 100644 --- a/src/sna/gen4_vertex.c +++ b/src/sna/gen4_vertex.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c index 77793dc4..6154404d 100644 --- a/src/sna/gen5_render.c +++ b/src/sna/gen5_render.c @@ -29,10 +29,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen6_common.c b/src/sna/gen6_common.c index 8789109f..1bad3289 100644 --- a/src/sna/gen6_common.c +++ b/src/sna/gen6_common.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gen6_common.h" #include "gen4_vertex.h" diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index f14eacdd..b3f4e3a0 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -29,10 +29,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index cecec212..1f385f57 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -29,10 +29,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen8_eu.c b/src/sna/gen8_eu.c index 5b9923d6..88806a87 100644 --- a/src/sna/gen8_eu.c +++ b/src/sna/gen8_eu.c @@ -20,10 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c index b1c5819c..d3635a4e 100644 --- a/src/sna/gen8_render.c +++ b/src/sna/gen8_render.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/gen8_vertex.c b/src/sna/gen8_vertex.c index c66d8642..c15fc5ec 100644 --- a/src/sna/gen8_vertex.c +++ b/src/sna/gen8_vertex.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c index 1f7c2dbd..8cd81a68 100644 --- a/src/sna/gen9_render.c +++ b/src/sna/gen9_render.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 5d06e666..b02f3ae5 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/kgem_debug.c b/src/sna/kgem_debug.c index d90e5439..f229ef9c 100644 --- a/src/sna/kgem_debug.c +++ b/src/sna/kgem_debug.c @@ -24,10 +24,7 @@ * Eric Anholt * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen2.c b/src/sna/kgem_debug_gen2.c index 080202cf..a5f35cf0 100644 --- a/src/sna/kgem_debug_gen2.c +++ b/src/sna/kgem_debug_gen2.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen3.c b/src/sna/kgem_debug_gen3.c index 5cb6330e..ee7cbcd8 100644 --- a/src/sna/kgem_debug_gen3.c +++ b/src/sna/kgem_debug_gen3.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen4.c b/src/sna/kgem_debug_gen4.c index 1d29238a..dd077efa 100644 --- a/src/sna/kgem_debug_gen4.c +++ b/src/sna/kgem_debug_gen4.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen5.c b/src/sna/kgem_debug_gen5.c index 10a66e24..91b768f4 100644 --- a/src/sna/kgem_debug_gen5.c +++ b/src/sna/kgem_debug_gen5.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen6.c b/src/sna/kgem_debug_gen6.c index 579c5d54..35c615e0 100644 --- a/src/sna/kgem_debug_gen6.c +++ b/src/sna/kgem_debug_gen6.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/kgem_debug_gen7.c b/src/sna/kgem_debug_gen7.c index 1bc014bf..8b9af392 100644 --- a/src/sna/kgem_debug_gen7.c +++ b/src/sna/kgem_debug_gen7.c @@ -25,10 +25,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index d0095687..9618505f 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_reg.h" diff --git a/src/sna/sna_acpi.c b/src/sna/sna_acpi.c index 643d04af..8ca27d44 100644 --- a/src/sna/sna_acpi.c +++ b/src/sna/sna_acpi.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c index 00522436..3dbb648c 100644 --- a/src/sna/sna_blt.c +++ b/src/sna/sna_blt.c @@ -27,10 +27,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c index 9403c254..79bab337 100644 --- a/src/sna/sna_composite.c +++ b/src/sna/sna_composite.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_cpu.c b/src/sna/sna_cpu.c index a3434b11..da078996 100644 --- a/src/sna/sna_cpu.c +++ b/src/sna/sna_cpu.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_cpuid.h" diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c index 8f13564e..06e7bcbc 100644 --- a/src/sna/sna_damage.c +++ b/src/sna/sna_damage.c @@ -23,10 +23,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 7a057951..4a5ac600 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -25,10 +25,7 @@ * Dave Airlie * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c index ed26199c..6c0eb975 100644 --- a/src/sna/sna_display_fake.c +++ b/src/sna/sna_display_fake.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index 047f6f01..a85ef849 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -31,10 +31,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. * David Dawes * Keith Whitwell */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c index cea1efc7..1f183743 100644 --- a/src/sna/sna_dri3.c +++ b/src/sna/sna_dri3.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 6d80ffea..9b950d21 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -32,10 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. * David Dawes * Alan Hourihane */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index e71ff5a0..1ca313e1 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -57,10 +57,7 @@ * Author: Chris Wilson * Based on code by: Keith Packard and Owen Taylor */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_gradient.c b/src/sna/sna_gradient.c index 818a8b79..ddab9a40 100644 --- a/src/sna/sna_gradient.c +++ b/src/sna/sna_gradient.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c index de5ac5e6..55b3f44a 100644 --- a/src/sna/sna_io.c +++ b/src/sna/sna_io.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_present.c b/src/sna/sna_present.c index 99e79c01..9cc18c19 100644 --- a/src/sna/sna_present.c +++ b/src/sna/sna_present.c @@ -19,10 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 8d92f25f..7076d08d 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_stream.c b/src/sna/sna_stream.c index 378825e4..72f4e075 100644 --- a/src/sna/sna_stream.c +++ b/src/sna/sna_stream.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_threads.c b/src/sna/sna_threads.c index f9c6b1e8..09d292e6 100644 --- a/src/sna/sna_threads.c +++ b/src/sna/sna_threads.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c index 8e2627f7..36378157 100644 --- a/src/sna/sna_tiling.c +++ b/src/sna/sna_tiling.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_transform.c b/src/sna/sna_transform.c index b62b3238..a2b66a88 100644 --- a/src/sna/sna_transform.c +++ b/src/sna/sna_transform.c @@ -26,10 +26,7 @@ * Jesse Barns * Chris Wilson */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c index 711446cd..4fb5592a 100644 --- a/src/sna/sna_trapezoids.c +++ b/src/sna/sna_trapezoids.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c index bbf83759..927544b0 100644 --- a/src/sna/sna_trapezoids_boxes.c +++ b/src/sna/sna_trapezoids_boxes.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_trapezoids_imprecise.c b/src/sna/sna_trapezoids_imprecise.c index d8a5caff..28c27f10 100644 --- a/src/sna/sna_trapezoids_imprecise.c +++ b/src/sna/sna_trapezoids_imprecise.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_trapezoids_mono.c b/src/sna/sna_trapezoids_mono.c index 53f036f8..13750096 100644 --- a/src/sna/sna_trapezoids_mono.c +++ b/src/sna/sna_trapezoids_mono.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_trapezoids_precise.c b/src/sna/sna_trapezoids_precise.c index bb08c41e..6e41604f 100644 --- a/src/sna/sna_trapezoids_precise.c +++ b/src/sna/sna_trapezoids_precise.c @@ -26,10 +26,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_render.h" diff --git a/src/sna/sna_vertex.c b/src/sna/sna_vertex.c index 86ad2c50..8fd58d3a 100644 --- a/src/sna/sna_vertex.c +++ b/src/sna/sna_vertex.c @@ -24,10 +24,7 @@ * Chris Wilson * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c index 5b3e6b6d..b2e15f59 100644 --- a/src/sna/sna_video.c +++ b/src/sna/sna_video.c @@ -40,10 +40,7 @@ * Offscreen Images: * Matt Sottek */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/sna/sna_video_hwmc.c b/src/sna/sna_video_hwmc.c index b2319c96..02138dda 100644 --- a/src/sna/sna_video_hwmc.c +++ b/src/sna/sna_video_hwmc.c @@ -24,9 +24,7 @@ * Zhenyu Wang * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _SNA_XVMC_SERVER_ #include "sna.h" diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c index fd92b8b6..4cef42db 100644 --- a/src/sna/sna_video_overlay.c +++ b/src/sna/sna_video_overlay.c @@ -23,10 +23,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_video.h" diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c index 57a75286..1c44cd7f 100644 --- a/src/sna/sna_video_sprite.c +++ b/src/sna/sna_video_sprite.c @@ -23,10 +23,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_video.h" diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index 0b3330f2..11353903 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -24,9 +24,7 @@ **************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "sna.h" #include "sna_video.h" diff --git a/src/uxa/i830_3d.c b/src/uxa/i830_3d.c index 5dec2727..5f06cf7a 100644 --- a/src/uxa/i830_3d.c +++ b/src/uxa/i830_3d.c @@ -25,9 +25,7 @@ * **************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/i830_render.c b/src/uxa/i830_render.c index 905b1569..539b565f 100644 --- a/src/uxa/i830_render.c +++ b/src/uxa/i830_render.c @@ -25,10 +25,7 @@ * Eric Anholt * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/i915_3d.c b/src/uxa/i915_3d.c index 41006fa0..7806de7e 100644 --- a/src/uxa/i915_3d.c +++ b/src/uxa/i915_3d.c @@ -24,10 +24,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/i915_render.c b/src/uxa/i915_render.c index 117f0ccc..de1f507f 100644 --- a/src/uxa/i915_render.c +++ b/src/uxa/i915_render.c @@ -25,10 +25,7 @@ * Eric Anholt * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/i915_video.c b/src/uxa/i915_video.c index 10d966ab..26efd55c 100644 --- a/src/uxa/i915_video.c +++ b/src/uxa/i915_video.c @@ -24,10 +24,7 @@ * Eric Anholt * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/i965_3d.c b/src/uxa/i965_3d.c index e067c8ce..1393cc93 100644 --- a/src/uxa/i965_3d.c +++ b/src/uxa/i965_3d.c @@ -20,10 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/uxa/i965_render.c b/src/uxa/i965_render.c index 3f2e0ea3..b05e4462 100644 --- a/src/uxa/i965_render.c +++ b/src/uxa/i965_render.c @@ -28,10 +28,7 @@ * Keith Packard * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "xorg-server.h" diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c index c7070361..c75c35f8 100644 --- a/src/uxa/i965_video.c +++ b/src/uxa/i965_video.c @@ -25,10 +25,7 @@ * Keith Packard * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/intel.h b/src/uxa/intel.h index ee3e9076..cc5e897a 100644 --- a/src/uxa/intel.h +++ b/src/uxa/intel.h @@ -33,10 +33,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * David Dawes * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #if 0 #define I830DEBUG diff --git a/src/uxa/intel_batchbuffer.c b/src/uxa/intel_batchbuffer.c index 114c6026..a3a74328 100644 --- a/src/uxa/intel_batchbuffer.c +++ b/src/uxa/intel_batchbuffer.c @@ -25,10 +25,7 @@ * Eric Anholt * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 1715b1fd..62cdee56 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -24,10 +24,7 @@ * Dave Airlie * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c index fe0d664d..7d5f5404 100644 --- a/src/uxa/intel_dri.c +++ b/src/uxa/intel_dri.c @@ -31,10 +31,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. * David Dawes * Keith Whitwell */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_dri3.c b/src/uxa/intel_dri3.c index 6cb23bbf..55a356fa 100644 --- a/src/uxa/intel_dri3.c +++ b/src/uxa/intel_dri3.c @@ -19,10 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 547873a3..9d2dd7cf 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -32,10 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. * David Dawes * Alan Hourihane */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_hwmc.c b/src/uxa/intel_hwmc.c index 78540600..ea779ef6 100644 --- a/src/uxa/intel_hwmc.c +++ b/src/uxa/intel_hwmc.c @@ -24,9 +24,7 @@ * Zhenyu Wang * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _INTEL_XVMC_SERVER_ #include "intel.h" diff --git a/src/uxa/intel_memory.c b/src/uxa/intel_memory.c index b2d7a367..34f35700 100644 --- a/src/uxa/intel_memory.c +++ b/src/uxa/intel_memory.c @@ -69,10 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * binding process. For smaller allocations, the acceleration architecture's * linear allocator is preferred. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_present.c b/src/uxa/intel_present.c index d92aebc6..4aafcdbe 100644 --- a/src/uxa/intel_present.c +++ b/src/uxa/intel_present.c @@ -19,10 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c index e30823d8..2c78dbbb 100644 --- a/src/uxa/intel_uxa.c +++ b/src/uxa/intel_uxa.c @@ -26,10 +26,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include diff --git a/src/uxa/intel_uxa_video.c b/src/uxa/intel_uxa_video.c index 8c4474a8..77319e02 100644 --- a/src/uxa/intel_uxa_video.c +++ b/src/uxa/intel_uxa_video.c @@ -40,10 +40,7 @@ * Offscreen Images: * Matt Sottek */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_video.c b/src/uxa/intel_video.c index 22f40d24..1be5d885 100644 --- a/src/uxa/intel_video.c +++ b/src/uxa/intel_video.c @@ -44,10 +44,7 @@ /* * XXX Could support more formats. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/intel_video_overlay.c b/src/uxa/intel_video_overlay.c index ee3fcbb0..ae5cd469 100644 --- a/src/uxa/intel_video_overlay.c +++ b/src/uxa/intel_video_overlay.c @@ -44,10 +44,7 @@ /* * XXX Could support more formats. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c index 0b6538e1..eca67474 100644 --- a/src/uxa/uxa-accel.c +++ b/src/uxa/uxa-accel.c @@ -28,9 +28,6 @@ * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif #include "uxa-priv.h" #include #include "dixfontstr.h" diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c index 02791ffa..7f82da9d 100644 --- a/src/uxa/uxa-glyphs.c +++ b/src/uxa/uxa-glyphs.c @@ -58,10 +58,6 @@ * Based on code by: Keith Packard and Owen Taylor */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #include "uxa-priv.h" diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h index a8d129ca..03c50ee4 100644 --- a/src/uxa/uxa-priv.h +++ b/src/uxa/uxa-priv.h @@ -26,16 +26,10 @@ #ifndef UXAPRIV_H #define UXAPRIV_H -#ifdef HAVE_CONFIG_H #include -#endif -#ifdef HAVE_DIX_CONFIG_H -#include -#else #include -#endif -#include "xf86.h" +#include "xf86.h" #include "uxa.h" #include diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c index ec1301f9..ebd18926 100644 --- a/src/uxa/uxa-render.c +++ b/src/uxa/uxa-render.c @@ -21,11 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #include "uxa-priv.h" diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c index 5401d2c6..e396df37 100644 --- a/src/uxa/uxa.c +++ b/src/uxa/uxa.c @@ -27,11 +27,6 @@ * functions not responsible for performing rendering, pixmap migration, or * memory management. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #include "uxa-priv.h" diff --git a/test/cursor-test.c b/test/cursor-test.c index 9259049f..2e7141a2 100644 --- a/test/cursor-test.c +++ b/test/cursor-test.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/dri2-speed.c b/test/dri2-speed.c index 87b9d0b6..3a0c9b4a 100644 --- a/test/dri2-speed.c +++ b/test/dri2-speed.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/dri3-test.c b/test/dri3-test.c index 4346aa97..d1ed1cf5 100644 --- a/test/dri3-test.c +++ b/test/dri3-test.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c index 9eef8db0..908c0714 100644 --- a/test/lowlevel-blt-bench.c +++ b/test/lowlevel-blt-bench.c @@ -22,10 +22,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/present-race.c b/test/present-race.c index b2b6aa2b..d7c6a06d 100644 --- a/test/present-race.c +++ b/test/present-race.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/present-speed.c b/test/present-speed.c index 7765aa94..def04961 100644 --- a/test/present-speed.c +++ b/test/present-speed.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/present-test.c b/test/present-test.c index 5a12a24f..fd5dd82b 100644 --- a/test/present-test.c +++ b/test/present-test.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/shm-test.c b/test/shm-test.c index 684d142e..fa3556ec 100644 --- a/test/shm-test.c +++ b/test/shm-test.c @@ -21,10 +21,7 @@ * SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/tools/backlight_helper.c b/tools/backlight_helper.c index 65151a53..81c6de2e 100644 --- a/tools/backlight_helper.c +++ b/tools/backlight_helper.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/tools/cursor.c b/tools/cursor.c index 6a2438ad..c69d65cd 100644 --- a/tools/cursor.c +++ b/tools/cursor.c @@ -21,10 +21,7 @@ * IN THE SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/tools/virtual.c b/tools/virtual.c index 9a4dde8e..7259b913 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -21,10 +21,7 @@ * IN THE SOFTWARE. * */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include