wez Thu Jun 9 09:09:05 2005 EDT
Modified files:
/php-src/win32/build config.w32 config.w32.h.in confutils.js
Log:
add --enable-memory-manager switch for win32 too
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.39&r2=1.40&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.39 php-src/win32/build/config.w32:1.40
--- php-src/win32/build/config.w32:1.39 Sat Jun 4 21:57:03 2005
+++ php-src/win32/build/config.w32 Thu Jun 9 09:09:04 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.39 2005/06/05 01:57:03 wez Exp $
+// $Id: config.w32,v 1.40 2005/06/09 13:09:04 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -248,9 +248,11 @@
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");
http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.6&r2=1.7&ty=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.6
php-src/win32/build/config.w32.h.in:1.7
--- php-src/win32/build/config.w32.h.in:1.6 Wed Jun 8 16:50:44 2005
+++ php-src/win32/build/config.w32.h.in Thu Jun 9 09:09:04 2005
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.6 2005/06/08 20:50:44 fmk Exp $
+ $Id: config.w32.h.in,v 1.7 2005/06/09 13:09:04 wez Exp $
*/
/* Default PHP / PEAR directories */
@@ -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
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.56&r2=1.57&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.56
php-src/win32/build/confutils.js:1.57
--- php-src/win32/build/confutils.js:1.56 Sun Jun 5 15:19:09 2005
+++ php-src/win32/build/confutils.js Thu Jun 9 09:09:04 2005
@@ -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 @@
'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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
