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.

27 files changed, 1 insertions, 55 deletions

diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h
index 515bb03bc..544d38816 100644
--- a/boilerplate/cairo-boilerplate.h
+++ b/boilerplate/cairo-boilerplate.h
@@ -26,9 +26,7 @@
 #ifndef _CAIRO_BOILERPLATE_H_
 #define _CAIRO_BOILERPLATE_H_
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/perf/cairo-perf-print.c b/perf/cairo-perf-print.c
index d7ae1311e..ab1440f55 100644
--- a/perf/cairo-perf-print.c
+++ b/perf/cairo-perf-print.c
@@ -27,9 +27,7 @@
  *	    Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "cairo-perf.h"
 #include "cairo-stats.h"
diff --git a/src/cairo-atomic-private.h b/src/cairo-atomic-private.h
index 70d4b79d6..d23192b41 100644
--- a/src/cairo-atomic-private.h
+++ b/src/cairo-atomic-private.h
@@ -39,11 +39,9 @@
 #ifndef CAIRO_ATOMIC_PRIVATE_H
 #define CAIRO_ATOMIC_PRIVATE_H
 
-# include "cairo-compiler-private.h"
+#include "cairo-compiler-private.h"
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <assert.h>
 
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index 4562bea66..00703c584 100644
--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@@ -40,9 +40,7 @@
 
 #include "cairo.h"
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 /* Size in bytes of buffer to use off the stack per functions.
  * Mostly used by text functions.  For larger allocations, they'll
diff --git a/src/cairo-mutex-impl-private.h b/src/cairo-mutex-impl-private.h
index 25223f3ea..a31e1e0d9 100644
--- a/src/cairo-mutex-impl-private.h
+++ b/src/cairo-mutex-impl-private.h
@@ -43,9 +43,7 @@
 
 #include "cairo.h"
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #if HAVE_LOCKDEP
 #include <lockdep.h>
diff --git a/src/cairo-wideint-type-private.h b/src/cairo-wideint-type-private.h
index 84a3cbab0..a1a2269f8 100644
--- a/src/cairo-wideint-type-private.h
+++ b/src/cairo-wideint-type-private.h
@@ -39,9 +39,7 @@
 
 #include "cairo.h"
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #if   HAVE_STDINT_H
 # include <stdint.h>
diff --git a/src/cairoint.h b/src/cairoint.h
index c97ad57fa..03ca09c10 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -46,9 +46,7 @@
 #ifndef _CAIROINT_H_
 #define _CAIROINT_H_
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef _MSC_VER
 #define cairo_public __declspec(dllexport)
diff --git a/test/any2ppm.c b/test/any2ppm.c
index b3f1308ea..d2d5fc5e2 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -50,9 +50,7 @@
  * Author: Kristian Høgsberg <krh@redhat.com>
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/test/api-special-cases.c b/test/api-special-cases.c
index aa615f804..ae87d0e5d 100644
--- a/test/api-special-cases.c
+++ b/test/api-special-cases.c
@@ -56,9 +56,7 @@
  * enough to just add a new check to the function it complained about.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <assert.h>
 #include <limits.h>
diff --git a/test/buffer-diff.c b/test/buffer-diff.c
index 087ac459b..6d2a6bf8a 100644
--- a/test/buffer-diff.c
+++ b/test/buffer-diff.c
@@ -23,9 +23,7 @@
  *
  * Author: Richard D. Worth <richard@theworths.org> */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 853e7d260..3d241d814 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -25,9 +25,7 @@
  *         Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/error-setters.c b/test/error-setters.c
index ff65ad4f2..8ad823def 100644
--- a/test/error-setters.c
+++ b/test/error-setters.c
@@ -23,9 +23,7 @@
  * Author: Benjamin Otte <otte@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c
index 306a57013..83020fc37 100644
--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@@ -25,9 +25,7 @@
  *         Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/imagediff.c b/test/imagediff.c
index 6ebbcfca7..c091e7627 100644
--- a/test/imagediff.c
+++ b/test/imagediff.c
@@ -23,9 +23,7 @@
  *
  * Author: Richard D. Worth <richard@theworths.org> */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/pdiff/pdiff.c b/test/pdiff/pdiff.c
index e982cdcc2..6e05552d6 100644
--- a/test/pdiff/pdiff.c
+++ b/test/pdiff/pdiff.c
@@ -14,9 +14,7 @@
   if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
 */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "lpyramid.h"
 #include <math.h>
diff --git a/test/ps-eps.c b/test/ps-eps.c
index de1248d81..60203a1cb 100644
--- a/test/ps-eps.c
+++ b/test/ps-eps.c
@@ -27,9 +27,7 @@
  *         Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/solid-pattern-cache-stress.c b/test/solid-pattern-cache-stress.c
index c2a1c1526..56972bfaf 100644
--- a/test/solid-pattern-cache-stress.c
+++ b/test/solid-pattern-cache-stress.c
@@ -23,9 +23,7 @@
  * Author: Chris Wilson <chris at chris-wilson.co.uk>
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "cairo-test.h"
 #include <stdlib.h> /* drand48() */
diff --git a/test/toy-font-face.c b/test/toy-font-face.c
index cbebf840a..95d2c01eb 100644
--- a/test/toy-font-face.c
+++ b/test/toy-font-face.c
@@ -24,9 +24,7 @@
  *         Behdad Esfahbod <behdad@behdad.org>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "cairo-test.h"
 
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 <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <cairo.h>
 #include <cairo-script.h>
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 <otte@redhat.com>
  */
 
-#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 <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <cairo.h>
 #include <cairo-script.h>
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 <stdio.h>
 #include <stdlib.h>
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 <http://www.gnu.org/licenses/>.
  */
 
-#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 <cairo-xml.h>
 #include <cairo-script-interpreter.h>