diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-08-06 08:56:15 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-08-06 08:56:15 +0000 |
| commit | 4b8a100ec97dde79c5dc9e3ba0b50c3ce8939e85 (patch) | |
| tree | ce1a0debe3e6f7caa706bcff18326387fda0eac6 | |
| parent | 104de20298a15928118f75571abd8f3a8ce85a0c (diff) | |
| download | php-git-4b8a100ec97dde79c5dc9e3ba0b50c3ce8939e85.tar.gz | |
fix for #1947
| -rw-r--r-- | ext/standard/basic_functions.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 9793ae1ceb..25a923e93a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -47,6 +47,17 @@ #include "php_globals.h" #include "SAPI.h" +#if APACHE +/* + ap_compat.h does a + #define md5 ap_md5 + which "kills" out md5 function. +*/ +#ifdef md5 +#undef md5 +#endif +#endif + static unsigned char second_and_third_args_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; static pval *user_compare_func_name; |