From: Daniel Beulshausen <dbeu@php.net>
Date: Mon, 16 Oct 2000 13:55:47 +0000 (+0000)
Subject: include php.h to have VIRTUAL_DIR defined this
X-Git-Tag: php-4.0.4RC3~665
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f5e25598aab70073da1b56428cb8e693e19ce79;p=php

include php.h to have VIRTUAL_DIR defined this
should fix bugs where the ttf functions won't
find the font in the actual working dir
# like under windows :)
---

diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c
index ee58481e4c..0be895fb7b 100644
--- a/ext/gd/gdttf.c
+++ b/ext/gd/gdttf.c
@@ -4,7 +4,9 @@
 
 /* $Id$ */
 
-#if WIN32|WINNT
+#include "php.h"
+
+#if PHP_WIN32
 #include "config.w32.h"
 #else
 #include "php_config.h"
@@ -44,6 +46,7 @@ extern int gdImageColorResolve(gdImagePtr, int, int, int);
 #define RESOLUTION 72
 
 /* Number of colors used for anti-aliasing */
+#undef NUMCOLORS
 #define NUMCOLORS 4
 
 /* Line separation as a factor of font height.  
@@ -56,8 +59,12 @@ extern int gdImageColorResolve(gdImagePtr, int, int, int);
 #define TRUE !FALSE
 #endif
 
+#ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+#ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
 
 typedef struct {
 	char				*fontname;	/* key */