fix for #1947

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9793ae1cebd6ad419b25c5709c9efe681a463b13..25a923e93a9afa3cbe6622bb5a3226a9d9933e46 100644 (file)
--- 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;