Fixed bug #27437 (wrong freetype include inside GD library).

diff --git a/NEWS b/NEWS
index 12037c5b12cccdeb09ba45ba68bc34a77f6e2bf3..ccb58a6af837fdd361cbe0ec4e3dad90f68457a4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP 4                                                                      NEWS
 - Fixed possible crashes inside socket extension, due to missing check inside
   allocation functions. (Ilia)
 - Fixed bug #27443 (defined() returns wrong type). (Derick)
+- Fixed bug #27437 (wrong freetype include inside GD library). (Ilia)
 - Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)
 - Fixed bug #27383 (Potential crash inside fopen_wrapper, while parsing
   response code). (Ilia)

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 1f76b141beb5cde3cf40f979b54f00b23f2ece4e..7578857c1b6041b8cb88dc99195b642a71058a47 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -62,7 +62,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 #include "gdcache.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include "freetype/ftglyph.h"
+#include FT_GLYPH_H
 
 /* number of fonts cached before least recently used is replaced */
 #define FONTCACHESIZE 6