cvs: /php4/ext/standard basic_functions.c
| From: | Thies C . Arntzen | Date: | Fri, 06 Aug 1999 08:56:15 +0000 |
| Subject: | cvs: /php4/ext/standard basic_functions.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-3171@lists.php.net to get a copy of this message | ||
thies Fri Aug 6 04:56:15 1999 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
fix for #1947
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.65 php4/ext/standard/basic_functions.c:1.66
--- php4/ext/standard/basic_functions.c:1.65 Mon Aug 2 15:16:50 1999
+++ php4/ext/standard/basic_functions.c Fri Aug 6 04:56:15 1999
@@ -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;