diff options
| -rw-r--r-- | ext/standard/basic_functions.c | 10 | ||||
| -rw-r--r-- | ext/standard/md5.c | 2 | ||||
| -rw-r--r-- | ext/standard/md5.h | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 2a349b75fe..59e7fe1df1 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -50,14 +50,6 @@ #include "php_globals.h" #include "SAPI.h" -#if APACHE -/* - ap_compat.h does a - #define md5 ap_md5 - which "kills" out md5 function. -*/ -#undef md5 -#endif #ifdef ZTS int basic_globals_id; @@ -114,7 +106,7 @@ function_entry basic_functions[] = { PHP_FE(htmlentities, NULL) PHP_FE(get_html_translation_table, NULL) - PHP_FE(md5, NULL) + PHP_NAMED_FE(md5, php_if_md5, NULL) PHP_FE(iptcparse, NULL) PHP_FE(iptcembed, NULL) diff --git a/ext/standard/md5.c b/ext/standard/md5.c index 3396e261af..e89e177d37 100644 --- a/ext/standard/md5.c +++ b/ext/standard/md5.c @@ -27,7 +27,7 @@ /* {{{ proto string md5(string str) Calculate the md5 hash of a string */ -PHP_FUNCTION(md5) +PHP_NAMED_FUNCTION(php_if_md5) { pval **arg; char md5str[33]; diff --git a/ext/standard/md5.h b/ext/standard/md5.h index 47ce03682e..f754590748 100644 --- a/ext/standard/md5.h +++ b/ext/standard/md5.h @@ -66,6 +66,6 @@ void PHP3_MD5Init PROTO_LIST((PHP3_MD5_CTX *)); void PHP3_MD5Update PROTO_LIST((PHP3_MD5_CTX *, const unsigned char *, unsigned int)); void PHP3_MD5Final PROTO_LIST((unsigned char[16], PHP3_MD5_CTX *)); -PHP_FUNCTION(md5); +PHP_NAMED_FUNCTION(php_if_md5); #endif |