From bd138412579e9a7c251ea8f2f1bb2cdb3d0bf95b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 1 May 2021 17:05:29 +0100 Subject: Drop the conditional inclusion of config.h We *always* generate this file, and we depend on its existence. The idea behind HAVE_CONFIG_H was being able to include random files from different projects, back in a time where "libraries" were literally just random files instead of actual shared objects. Since we're not in the '80s any more, and our build system(s) define HAVE_CONFIG_H *and* generate the config.h header file, we don't need a conditional guard around its inclusion. --- util/cairo-fdr/fdr.c | 2 -- util/cairo-gobject/cairo-gobject-enums.c | 2 -- util/cairo-gobject/cairo-gobject-structs.c | 2 -- util/cairo-script/cairo-script-private.h | 2 -- util/cairo-sphinx/fdr.c | 2 -- util/cairo-sphinx/sphinx.c | 2 -- util/cairo-trace/lookup-symbol.c | 2 -- util/cairo-trace/trace.c | 2 -- util/trace-to-xml.c | 2 -- 9 files changed, 18 deletions(-) (limited to 'util') diff --git a/util/cairo-fdr/fdr.c b/util/cairo-fdr/fdr.c index fa64254b1..edbd53a5b 100644 --- a/util/cairo-fdr/fdr.c +++ b/util/cairo-fdr/fdr.c @@ -16,9 +16,7 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/util/cairo-gobject/cairo-gobject-enums.c b/util/cairo-gobject/cairo-gobject-enums.c index 0c5069406..ce7d70c60 100644 --- a/util/cairo-gobject/cairo-gobject-enums.c +++ b/util/cairo-gobject/cairo-gobject-enums.c @@ -1,9 +1,7 @@ /* Generated data (by glib-mkenums) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "cairo-gobject.h" diff --git a/util/cairo-gobject/cairo-gobject-structs.c b/util/cairo-gobject/cairo-gobject-structs.c index 9171abeb8..c8f59d7e7 100644 --- a/util/cairo-gobject/cairo-gobject-structs.c +++ b/util/cairo-gobject/cairo-gobject-structs.c @@ -34,9 +34,7 @@ * Benjamin Otte */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "cairo-gobject.h" diff --git a/util/cairo-script/cairo-script-private.h b/util/cairo-script/cairo-script-private.h index ac633c950..7ae8be925 100644 --- a/util/cairo-script/cairo-script-private.h +++ b/util/cairo-script/cairo-script-private.h @@ -35,9 +35,7 @@ #ifndef CAIRO_SCRIPT_PRIVATE_H #define CAIRO_SCRIPT_PRIVATE_H -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "cairo-script-interpreter.h" diff --git a/util/cairo-sphinx/fdr.c b/util/cairo-sphinx/fdr.c index 5c08953b5..a28251650 100644 --- a/util/cairo-sphinx/fdr.c +++ b/util/cairo-sphinx/fdr.c @@ -16,9 +16,7 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c index 5c5fcee77..9e248aff1 100644 --- a/util/cairo-sphinx/sphinx.c +++ b/util/cairo-sphinx/sphinx.c @@ -6,9 +6,7 @@ * delta-debugging to reduce that down to a minimal trace.) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c index a670f4556..4bc1fac1a 100644 --- a/util/cairo-trace/lookup-symbol.c +++ b/util/cairo-trace/lookup-symbol.c @@ -45,9 +45,7 @@ This file was part of GNU Binutils. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define true 1 #define false 0 diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c index 931e775f8..babcc06fa 100644 --- a/util/cairo-trace/trace.c +++ b/util/cairo-trace/trace.c @@ -16,9 +16,7 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* The autoconf on OpenBSD 4.5 produces the malformed constant name * SIZEOF_VOID__ rather than SIZEOF_VOID_P. Work around that here. */ diff --git a/util/trace-to-xml.c b/util/trace-to-xml.c index a0f03ccff..b4295fbdd 100644 --- a/util/trace-to-xml.c +++ b/util/trace-to-xml.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include -- cgit v1.2.1