Move HAVE_CONFIG_H from .h to .c to not break when external app define the symbol (See Debian Bug#708413)

src/gd_color_map.h

@@ -1,10 +1,6 @@
 #ifndef GD_COLOR_MAP_H
 #define GD_COLOR_MAP_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 #ifdef __cplusplus

src/gd_io_stream.cxx

@@ -14,6 +14,11 @@
 	as an input stream has no need of output methods, and vice-versa.
 */
 #ifdef __cplusplus
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gd_io_stream.h"
 
 /**	Read into buffer from stream

src/gd_io_stream.h

@@ -31,10 +31,6 @@
 #ifndef _gd_io_stream_h
 #define _gd_io_stream_h
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 #include <iostream>
 

src/gd_tga.h

@@ -21,10 +21,6 @@
 #ifndef __TGA_H
 #define __TGA_H	1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 #include "gdhelpers.h"
 

src/gdcache.h

@@ -44,10 +44,6 @@ extern "C" {
 	/* header                                                */
 	/*********************************************************/
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #include <stdlib.h>
 #ifndef NULL
 #	define NULL (void *)0

src/gdfontg.c

@@ -10,6 +10,9 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontg.h"
 

src/gdfontg.h

@@ -16,10 +16,6 @@ extern "C"
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontGiant;

src/gdfontl.c

@@ -11,6 +11,9 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontl.h"
 

src/gdfontl.h

@@ -17,10 +17,6 @@ extern "C"
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontLarge;

src/gdfontmb.c

@@ -9,6 +9,9 @@
    No copyright info was found in the original bdf.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontmb.h"
 

src/gdfontmb.h

@@ -15,10 +15,6 @@ extern "C"
 	No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontMediumBold;

src/gdfonts.c

@@ -7,6 +7,9 @@
    No copyright info was found in the original bdf.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfonts.h"
 

src/gdfonts.h

@@ -15,10 +15,6 @@ extern "C"
 	No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontSmall;

src/gdfontt.c

@@ -10,6 +10,9 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontt.h"
 

src/gdfontt.h

@@ -16,10 +16,6 @@ extern "C"
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontTiny;

src/gdfx.h

@@ -5,21 +5,15 @@ extern "C" {
 #ifndef GDFX_H
 #define GDFX_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gd.h"
-
-	/* im MUST be square, but can have any size. Returns a new image
+/* im MUST be square, but can have any size. Returns a new image
 	of width and height radius * 2, in which the X axis of
 	the original has been remapped to theta (angle) and the Y axis
 	of the original has been remapped to rho (distance from center).
 	This is known as a "polar coordinate transform." */
 
-	BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
+BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
 
-	/* Draws the text 'top' and 'bottom' on 'im', curved along the
+/* Draws the text 'top' and 'bottom' on 'im', curved along the
 	edge of a circle of radius 'radius', with its
 	center at 'cx' and 'cy'. 'top' is written clockwise
 	along the top; 'bottom' is written counterclockwise
@@ -42,7 +36,7 @@ extern "C" {
 
 	Returns 0 on success, or an error string. */
 
-	BGD_DECLARE(char *) gdImageStringFTCircle(
+BGD_DECLARE(char *) gdImageStringFTCircle(
     gdImagePtr im,
     int cx,
     int cy,
@@ -55,7 +49,7 @@ extern "C" {
     char *bottom,
     int fgcolor);
 
-	/* 2.0.16:
+/* 2.0.16:
  * Sharpen function added on 2003-11-19
  * by Paul Troughton (paul<dot>troughton<at>ieee<dot>org)
  * Simple 3x3 convolution kernel
@@ -67,7 +61,7 @@ extern "C" {
  * Leaves transparency/alpha-channel untouched
  */
 
-	BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
+BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
 
 #endif /* GDFX_H */