From: Thies C. Arntzen <thies@php.net>
Date: Fri, 6 Aug 1999 08:56:15 +0000 (+0000)
Subject: fix for #1947
X-Git-Tag: php-4.0b2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b8a100ec97dde79c5dc9e3ba0b50c3ce8939e85;p=php

fix for #1947
---

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;