Move png and jpeg version functions to gd.c so the external library build doesn't...

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 4a29ab926424a6b8397aa060219e08972d4d93b5..5d02bed7858ba22a220c58ef9f23dd4a32737bd4 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -337,7 +337,6 @@ else
 
  if test "$PHP_GD" != "no"; then
   GD_MODULE_TYPE=external
-  extra_sources="libgd/gd_compat.c"
 
 dnl Various checks for GD features
   PHP_GD_ZLIB

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index eefa5df8017b441c01e75369230f603056d4e939..f412b2f03bb094bdff623ad90e4fc10b28715f33 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -29,6 +29,14 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_GD_PNG
+#include <png.h>
+#endif
+
+#ifdef HAVE_GD_JPG
+# include <jpeglib.h>
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/head.h"
@@ -53,6 +61,42 @@
 # include <Wingdi.h>
 #endif
 
+#ifndef HAVE_GD_BUNDLED
+#ifdef HAVE_GD_PNG
+const char * gdPngGetVersionString()
+{
+       return PNG_LIBPNG_VER_STRING;
+}
+#endif /* HAVE_GD_PNG */
+
+#ifdef HAVE_GD_JPG
+int gdJpegGetVersionInt()
+{
+       return JPEG_LIB_VERSION;
+}
+
+const char * gdJpegGetVersionString()
+{
+       switch(JPEG_LIB_VERSION) {
+               case 62:
+                       return "6b";
+                       break;
+
+               case 70:
+                       return "7";
+                       break;
+
+               case 80:
+                       return "8";
+                       break;
+
+               default:
+                       return "unknown";
+       }
+}
+#endif /* HAVE_GD_JPG */
+#endif /* HAVE_GD_BUNDLED */
+
 static int le_gd, le_gd_font;
 #if HAVE_LIBT1
 #include <t1lib.h>
@@ -1310,6 +1354,7 @@ PHP_MINFO_FUNCTION(gd)
                php_info_print_table_row(2, "libJPEG Version", gdJpegGetVersionString());
        }
 #endif
+
 #ifdef HAVE_GD_PNG
        php_info_print_table_row(2, "PNG Support", "enabled");
        php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());

diff --git a/ext/gd/libgd/gd_compat.c b/ext/gd/libgd/gd_compat.c
deleted file mode 100644 (file)
index 875fbd6..0000000
--- a/ext/gd/libgd/gd_compat.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "php_config.h" 
-#ifdef HAVE_GD_PNG
-/* needs to be first */
-# include <png.h>
-#endif
-
-#ifdef HAVE_GD_JPG
-# include <jpeglib.h>
-#endif
-
-#ifdef HAVE_GD_JPG
-int gdJpegGetVersionInt()
-{
-       return JPEG_LIB_VERSION;
-}
-
-const char * gdJpegGetVersionString()
-{
-       switch(JPEG_LIB_VERSION) {
-               case 62:
-                       return "6b";
-                       break;
-               default:
-                       return "unknown";
-       }
-}
-#endif
-
-#ifdef HAVE_GD_PNG
-const char * gdPngGetVersionString()
-{
-       return PNG_LIBPNG_VER_STRING;
-}
-#endif

diff --git a/ext/gd/libgd/gd_compat.h b/ext/gd/libgd/gd_compat.h
deleted file mode 100644 (file)
index 13fff2b..0000000
--- a/ext/gd/libgd/gd_compat.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GD_COMPAT_H
-#define GD_COMPAT_H 1
-
-#if HAVE_GD_BUNDLED
-# include "gd.h"
-#else
-# include <gd.h>
-#endif
-
-const char * gdPngGetVersionString();
-const char * gdJpegGetVersionString();
-int gdJpegGetVersionInt();
-
-#endif /* GD_COMPAT_H */