From ccb4b183489aef5d076a0c84e587084ccffc0f0f Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 31 Dec 1999 14:06:31 +0000 Subject: Happy new year (especially to Thies :) - Zend branch patches merged in - get the PHP tree uptodate - Clean --- main/php.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'main/php.h') diff --git a/main/php.h b/main/php.h index 1269bc1569..448b705b4f 100644 --- a/main/php.h +++ b/main/php.h @@ -253,13 +253,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list); #define PHP_MIME_TYPE "application/x-httpd-php" /* macros */ -#undef MIN -#undef MAX #undef COPY_STRING -#define DO_OR_DIE(retvalue) if (retvalue==FAILURE) { return FAILURE; } -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define STR_FREE(ptr) if (ptr && ptr!=empty_string && ptr!=undefined_variable_string) { efree(ptr); } #define COPY_STRING(yy) (yy).value.str.val = (char *) estrndup((yy).value.str.val,(yy).value.str.len) #define STR_PRINT(str) ((str)?(str):"") -- cgit v1.2.1