? win32_mhash.diff.txt
Index: config.w32
===================================================================
RCS file: /repository/php-src/ext/mhash/config.w32,v
retrieving revision 1.1
diff -u -p -d -r1.1 config.w32
--- config.w32	9 Jan 2004 13:42:14 -0000	1.1
+++ config.w32	20 Sep 2005 09:38:47 -0000
@@ -5,8 +5,10 @@ ARG_WITH("mhash", "mhash support", "no")
 
 if (PHP_MHASH != "no") {
 
+	MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
 	if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_MHASH') &&
-			CHECK_LIB('libmhash.lib', 'mhash')) {
+			(	CHECK_LIB(MHASH_LIB, 'mhash') ||
+				CHECK_LIB('libmhash.lib', 'mhash'))) {
 		EXTENSION('mhash', 'mhash.c');
 		AC_DEFINE('HAVE_LIBMHASH', 1);
 	} else {
Index: mhash.c
===================================================================
RCS file: /repository/php-src/ext/mhash/mhash.c,v
retrieving revision 1.48
diff -u -p -d -r1.48 mhash.c
--- mhash.c	3 Aug 2005 14:07:25 -0000	1.48
+++ mhash.c	20 Sep 2005 09:38:47 -0000
@@ -63,16 +63,15 @@ ZEND_GET_MODULE(mhash)
 PHP_MINIT_FUNCTION(mhash)
 {
 	int i, n, l;
-	char *name;
+	const char *name;
 	char buf[128];
 
 	n = mhash_count() + 1;
 
 	for (i=0; i<n; i++) {
-		if ((name = mhash_get_hash_name(i))) {
+		if ((name = mhash_get_hash_name_static(i))) {
 			l = snprintf(buf, 127, "MHASH_%s", name);
 			zend_register_long_constant(buf, l + 1, i, CONST_PERSISTENT, module_number TSRMLS_CC);
-			free(name);
 		}
 	}