From fc92678b05b15236939d66969fcd58285a41eeda Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@php.net>
Date: Thu, 9 Jun 2005 13:09:04 +0000
Subject: [PATCH] add --enable-memory-manager switch for win32 too

---
 win32/build/config.w32      | 4 +++-
 win32/build/config.w32.h.in | 1 -
 win32/build/confutils.js    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 4fb5a253b54..a2f64d2bd63 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -248,9 +248,11 @@ ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");
 ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));
 
 ARG_ENABLE("memory-limit", "Enable memory limit checking code", "no");
-
 AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == "yes" ? 1 : 0);
 
+ARG_ENABLE("memory-manager", "Enable Zend memory manager", "yes");
+AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == "yes" ? 1 : 0);
+
 ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no");
 if (PHP_ZEND_MULTIBYTE == "yes") {
 	STDOUT.WriteLine("Enabling Zend multibyte encoding support");
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 7872a30b802..89c16a9a1a5 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -63,7 +63,6 @@
 #define HAVE_TZSET 1
 #define HAVE_TZNAME 1
 #undef HAVE_FLOCK
-#define USE_ZEND_ALLOC 1
 #define HAVE_ALLOCA 1
 #undef HAVE_SYS_TIME_H
 #define HAVE_SIGNAL_H 1
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index cc679aa5bbd..4546ff5c254 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.56 2005-06-05 19:19:09 wez Exp $
+// $Id: confutils.js,v 1.57 2005-06-09 13:09:04 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -350,7 +350,7 @@ can be built that way. \
 		 'php-build', 'snapshot-template',
 		 'pcre-regex', 'fastcgi', 'force-cgi-redirect',
 		 'path-info-check', 'zts', 'ipv6', 'memory-limit',
-		 'zend-multibyte', 'fd-setsize'
+		 'zend-multibyte', 'fd-setsize', 'memory-manager'
 		);
 	var force;