diff options
author | Marcus Boerger <helly@php.net> | 2002-08-12 19:09:26 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2002-08-12 19:09:26 +0000 |
commit | ac9991a24589dacf8bb671274c9b39608fb503d3 (patch) | |
tree | 90360656e66a82c4fdd430ee9d2e4bc9e6c34794 | |
parent | 7d5d00bf81f723334129af889996450a49fcb592 (diff) | |
download | php-git-ac9991a24589dacf8bb671274c9b39608fb503d3.tar.gz |
-wrong fabsf define for MSVC.6
-MIN and MAX only if undefined
#should be last commit to fix all warnings (-:
-rw-r--r-- | ext/gd/libgd/gd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index a06a4549b4..364b39e6ab 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -26,7 +26,7 @@ extern float floorf(float x); #endif #if HAVE_FABSF == 0 /* float fabsf(float x); */ -# define fabsf(x) ((float)(abs(x))) +# define fabsf(x) ((float)(fabs(x))) #endif #if HAVE_FLOORF == 0 /* float floorf(float x);*/ @@ -235,9 +235,13 @@ gdImageColorClosestAlpha (gdImagePtr im, int r, int g, int b, int a) #define HWB_UNDEFINED -1 #define SETUP_RGB(s, r, g, b) {s.R = r/255.0f; s.G = g/255.0f; s.B = b/255.0f;} +#ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) +#endif #define MIN3(a,b,c) ((a)<(b)?(MIN(a,c)):(MIN(b,c))) +#ifndef MAX #define MAX(a,b) ((a)<(b)?(b):(a)) +#endif #define MAX3(a,b,c) ((a)<(b)?(MAX(b,c)):(MAX(a,c))) |