diff options
author | Zeev Suraski <zeev@php.net> | 1999-12-31 14:06:31 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 1999-12-31 14:06:31 +0000 |
commit | ccb4b183489aef5d076a0c84e587084ccffc0f0f (patch) | |
tree | d24fc346ee4f553447b763f797ef65b733264b8b /main/php.h | |
parent | f2d703e916e767e86c2d6434e809f29f6906f5fc (diff) | |
download | php-git-ccb4b183489aef5d076a0c84e587084ccffc0f0f.tar.gz |
Happy new year (especially to Thies :)
- Zend branch patches merged in - get the PHP tree uptodate
- Clean
Diffstat (limited to 'main/php.h')
-rw-r--r-- | main/php.h | 6 |
1 files changed, 0 insertions, 6 deletions
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):"") |