Changed name of the config-header to "pixman-config.h"

44 files changed, 46 insertions, 44 deletions

diff --git a/configure.ac b/configure.ac
index 9de9e22..b81d898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AM_INIT_AUTOMAKE([foreign dist-xz])
 # Suppress verbose compile lines
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(pixman-config.h)
 
 AC_CANONICAL_HOST
 
diff --git a/demos/dither.c b/demos/dither.c
index 63ba248..a6a157a 100644
--- a/demos/dither.c
+++ b/demos/dither.c
@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "pixman-config.h"
 #endif
 #include <math.h>
 #include <gtk/gtk.h>
diff --git a/demos/gtk-utils.c b/demos/gtk-utils.c
index cac8a8d..dc872a9 100644
--- a/demos/gtk-utils.c
+++ b/demos/gtk-utils.c
@@ -1,5 +1,7 @@
 #include <gtk/gtk.h>
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include <pixman-config.h>
+#endif
 #include "utils.h"
 #include "gtk-utils.h"
 
diff --git a/demos/scale.c b/demos/scale.c
index 7459a5c..fa2a28a 100644
--- a/demos/scale.c
+++ b/demos/scale.c
@@ -24,7 +24,7 @@
  * Author: Soren Sandmann <soren.sandmann@gmail.com>
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "pixman-config.h"
 #endif
 #include <math.h>
 #include <gtk/gtk.h>
diff --git a/pixman/make-srgb.pl b/pixman/make-srgb.pl
index cdaa80b..8bba160 100644
--- a/pixman/make-srgb.pl
+++ b/pixman/make-srgb.pl
@@ -73,7 +73,7 @@ print <<"PROLOG";
 #include <stdint.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/meson.build b/pixman/meson.build
index 652cda3..5dce870 100644
--- a/pixman/meson.build
+++ b/pixman/meson.build
@@ -20,7 +20,7 @@
 
 config_h = configure_file(
   configuration : config,
-  output : 'config.h'
+  output : 'pixman-config.h'
 )
 
 version_h = configure_file(
diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index 54b0f31..892e70b 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 62c9442..103f1c2 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <string.h>
diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index f0d1454..40f3a97 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -24,7 +24,7 @@
  *
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
index a164b7f..288172b 100644
--- a/pixman/pixman-arm.c
+++ b/pixman/pixman-arm.c
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index 6f65420..1698d73 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pixman/pixman-combine-float.c b/pixman/pixman-combine-float.c
index f5145bc..27392d6 100644
--- a/pixman/pixman-combine-float.c
+++ b/pixman/pixman-combine-float.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <math.h>
diff --git a/pixman/pixman-combine32.c b/pixman/pixman-combine32.c
index 4a89384..de51f64 100644
--- a/pixman/pixman-combine32.c
+++ b/pixman/pixman-combine32.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <math.h>
diff --git a/pixman/pixman-conical-gradient.c b/pixman/pixman-conical-gradient.c
index a39e20c..37dfffd 100644
--- a/pixman/pixman-conical-gradient.c
+++ b/pixman/pixman-conical-gradient.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/pixman/pixman-edge.c b/pixman/pixman-edge.c
index ad6dfc4..c324cd3 100644
--- a/pixman/pixman-edge.c
+++ b/pixman/pixman-edge.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <string.h>
diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index fa5ea03..4579fce 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <string.h>
 #include <stdlib.h>
diff --git a/pixman/pixman-filter.c b/pixman/pixman-filter.c
index fa94532..33327df 100644
--- a/pixman/pixman-filter.c
+++ b/pixman/pixman-filter.c
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <assert.h>
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 
diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 7e5a0d0..b4450cb 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
diff --git a/pixman/pixman-glyph.c b/pixman/pixman-glyph.c
index 96a349a..dc90411 100644
--- a/pixman/pixman-glyph.c
+++ b/pixman/pixman-glyph.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 
diff --git a/pixman/pixman-gradient-walker.c b/pixman/pixman-gradient-walker.c
index fb7f401..b31d5ad 100644
--- a/pixman/pixman-gradient-walker.c
+++ b/pixman/pixman-gradient-walker.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index db29ff5..46b201f 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
index 5a2cbfe..69fa70b 100644
--- a/pixman/pixman-implementation.c
+++ b/pixman/pixman-implementation.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdlib.h>
 #include "pixman-private.h"
diff --git a/pixman/pixman-linear-gradient.c b/pixman/pixman-linear-gradient.c
index 3f52850..014b69c 100644
--- a/pixman/pixman-linear-gradient.c
+++ b/pixman/pixman-linear-gradient.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdlib.h>
 #include "pixman-private.h"
diff --git a/pixman/pixman-matrix.c b/pixman/pixman-matrix.c
index 81b6e61..da5209c 100644
--- a/pixman/pixman-matrix.c
+++ b/pixman/pixman-matrix.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <math.h>
diff --git a/pixman/pixman-mips-dspr2.c b/pixman/pixman-mips-dspr2.c
index 87969ae..c43eb1e 100644
--- a/pixman/pixman-mips-dspr2.c
+++ b/pixman/pixman-mips-dspr2.c
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-mips.c b/pixman/pixman-mips.c
index 3048813..7479a08 100644
--- a/pixman/pixman-mips.c
+++ b/pixman/pixman-mips.c
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index d7cf265..f7f5560 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #if defined USE_X86_MMX || defined USE_ARM_IWMMXT || defined USE_LOONGSON_MMI
diff --git a/pixman/pixman-noop.c b/pixman/pixman-noop.c
index e598904..e43199b 100644
--- a/pixman/pixman-noop.c
+++ b/pixman/pixman-noop.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <string.h>
 #include <stdlib.h>
diff --git a/pixman/pixman-ppc.c b/pixman/pixman-ppc.c
index 4d5506d..926eb44 100644
--- a/pixman/pixman-ppc.c
+++ b/pixman/pixman-ppc.c
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-radial-gradient.c b/pixman/pixman-radial-gradient.c
index e8e99c9..38e1052 100644
--- a/pixman/pixman-radial-gradient.c
+++ b/pixman/pixman-radial-gradient.c
@@ -28,7 +28,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdlib.h>
 #include <math.h>
diff --git a/pixman/pixman-region16.c b/pixman/pixman-region16.c
index d88d338..da4719e 100644
--- a/pixman/pixman-region16.c
+++ b/pixman/pixman-region16.c
@@ -23,7 +23,7 @@
  * Author: Soren Sandmann <sandmann@redhat.com>
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #undef PIXMAN_DISABLE_DEPRECATED
diff --git a/pixman/pixman-region32.c b/pixman/pixman-region32.c
index abd6b1a..68b456b 100644
--- a/pixman/pixman-region32.c
+++ b/pixman/pixman-region32.c
@@ -23,7 +23,7 @@
  * Author: Soren Sandmann <sandmann@redhat.com>
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index 4694ebc..44f4de0 100644
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 
diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index ce4e75f..6082537 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -27,7 +27,7 @@
  * Based on work by Owen Taylor and Søren Sandmann
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 /* PSHUFD is slow on a lot of old processors, and new processors have SSSE3 */
diff --git a/pixman/pixman-ssse3.c b/pixman/pixman-ssse3.c
index 680d6b9..0359895 100644
--- a/pixman/pixman-ssse3.c
+++ b/pixman/pixman-ssse3.c
@@ -24,7 +24,7 @@
  * Author: Soren Sandmann (soren.sandmann@gmail.com)
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/pixman/pixman-timer.c b/pixman/pixman-timer.c
index f5ae18e..656d900 100644
--- a/pixman/pixman-timer.c
+++ b/pixman/pixman-timer.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c
index 7560405..0ec73dc 100644
--- a/pixman/pixman-trap.c
+++ b/pixman/pixman-trap.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <stdio.h>
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 2c2dddd..8c57b0b 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index 52de37e..1086b28 100644
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 #include "pixman-combine32.h"
diff --git a/pixman/pixman-x86.c b/pixman/pixman-x86.c
index 0130b7b..7f4d80e 100644
--- a/pixman/pixman-x86.c
+++ b/pixman/pixman-x86.c
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/pixman/pixman.c b/pixman/pixman.c
index 1a3cba0..17015a8 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 #include "pixman-private.h"
 
diff --git a/test/fence-image-self-test.c b/test/fence-image-self-test.c
index c80b3cf..2eb82ce 100644
--- a/test/fence-image-self-test.c
+++ b/test/fence-image-self-test.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "utils.h"
diff --git a/test/utils/utils-prng.h b/test/utils/utils-prng.h
index f9ae8dd..3cc3fbe 100644
--- a/test/utils/utils-prng.h
+++ b/test/utils/utils-prng.h
@@ -72,7 +72,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include "pixman-private.h"
diff --git a/test/utils/utils.h b/test/utils/utils.h
index 701417f..d3e1ba4 100644
--- a/test/utils/utils.h
+++ b/test/utils/utils.h
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <pixman-config.h>
 #endif
 
 #include <assert.h>