More work on php3_ annihilation...

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2a349b75fe2619edb3b921f0ef6384614fe6c185..59e7fe1df1e629bbe51f43b492584e096327f501 100644 (file)
--- 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 3396e261aff910e16b28573ecdbf998f5f291b6e..e89e177d37cb5f7eec83ee32607c0ab759ebfbda 100644 (file)
--- 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 47ce03682ecd8d2edf3ac01c60a7f8174ef02e7b..f75459074827f535d2d8896a562e462dec1c12be 100644 (file)
--- 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