From: Ilia Alshanetsky <iliaa@php.net>
Date: Sat, 6 Mar 2004 18:26:06 +0000 (+0000)
Subject: Fixed bug #27437 (wrong freetype include inside GD library).
X-Git-Tag: php-4.3.5RC4~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeaaaf7fce835a84ede91061689e2c37d3f7815b;p=php

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

diff --git a/NEWS b/NEWS
index 12037c5b12..ccb58a6af8 100644
--- 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 1f76b141be..7578857c1b 100644
--- 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