com php-src: final remove of the temporary int64/strlen configure options: configure.in win32/build/config.w32
| From: | Anatol Belski | Date: | Fri, 20 Dec 2013 08:06:31 +0000 |
| Subject: | com php-src: final remove of the temporary int64/strlen configure options: configure.in win32/build/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74538@lists.php.net to get a copy of this message | ||
Commit: b0a551ee140bc0c5ddd519d3c6dfde51a4569e76
Author: Anatol Belski <ab@php.net> Fri, 20 Dec 2013 09:06:31 +0100
Parents: f2fc935502b110b7a706d1641c000a9e9500315b
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b0a551ee140bc0c5ddd519d3c6dfde51a4569e76
Log:
final remove of the temporary int64/strlen configure options
Changed paths:
M configure.in
M win32/build/config.w32
Diff:
diff --git a/configure.in b/configure.in
index 6f508b0..f2a7e33 100644
--- a/configure.in
+++ b/configure.in
@@ -864,22 +864,6 @@ else
ZEND_DEBUG=no
fi
-#XXX remove this option, placebo for now
-PHP_ARG_ENABLE(zstrlen, whether to include Z_STRLEN macros,
-[ --enable-zstrlen Enable legacy Z_STRLEN macros and types], no, no)
-
-#if test "$PHP_ZSTRLEN" = "yes"; then
-# AC_DEFINE(ZEND_USE_LEGACY_STRING_TYPES, "1", [ ])
-#fi
-
-#XXX remove this option, placebo for now
-PHP_ARG_ENABLE(zint64, whether to enable 64 bit integers,
-[ --enable-zint64 Enable 64 bit integers], no, no)
-
-#if test "$PHP_ZINT64" = "yes"; then
-# AC_DEFINE(ZEND_ENABLE_INT64, "1", [ ])
-#fi
-
PHP_ARG_WITH(layout, layout of installed files,
[ --with-layout=TYPE Set how installed files will be laid out. Type can
be either PHP or GNU @<:@PHP@:>@], PHP, no)
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 034e059..bd6f3e2 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -450,13 +450,3 @@ if (PHP_STATIC_ANALYZE == "yes") {
ADD_FLAG("CFLAGS", " /wd6308 ");
}
-ARG_ENABLE("zstrlen", "Include Z_STRLEN macros enabling size_t for string
length", "no");
-if (PHP_ZSTRLEN == "yes") {
- // XXX remove this option, placebo for now
-}
-
-ARG_ENABLE("zint64", "Enable 64 bit integers", "no");
-if (PHP_ZINT64== "yes") {
- // XXX remove this option, placebo for now
-}
-