- Revert the weird change of ZEND_STRS() macro and use the correct

  ZEND_STRL() macro.
# ZEND_STRS was changed to be same as ZEND_STRL..someone on crack? :)

diff --git a/Zend/zend.h b/Zend/zend.h
index 9e74d851b2d928e190bd073b227bdfad3765bcc7..5c9ec20873f373b433c480b6d86b071b3faca784 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -377,7 +377,7 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length);
 #define MAX(a, b)  (((a)>(b))?(a):(b))
 #define MIN(a, b)  (((a)<(b))?(a):(b))
 #define ZEND_STRL(str)         (str), (sizeof(str)-1)
-#define ZEND_STRS(str)         (str), (sizeof(str)-1)
+#define ZEND_STRS(str)         (str), (sizeof(str))
 #define ZEND_NORMALIZE_BOOL(n)                 \
        ((n) ? (((n)>0) ? 1 : -1) : 0)
 #define ZEND_TRUTH(x)          ((x) ? 1 : 0)

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 0b913edbe5dd745a3eebba9b4c5bde8d14942ea8..2b0eba73f9101f435bd9ad50ecd7c2af9fc0deb1 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -116,25 +116,25 @@ void zend_register_standard_constants(TSRMLS_D)
                c.flags = CONST_PERSISTENT;
                c.module_number = 0;
 
-               c.name = zend_strndup(ZEND_STRS("TRUE"));
+               c.name = zend_strndup(ZEND_STRL("TRUE"));
                c.name_len = sizeof("TRUE");
                c.value.value.lval = 1;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);
                
-               c.name = zend_strndup(ZEND_STRS("FALSE"));
+               c.name = zend_strndup(ZEND_STRL("FALSE"));
                c.name_len = sizeof("FALSE");
                c.value.value.lval = 0;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);
 
-               c.name = zend_strndup(ZEND_STRS("ZEND_THREAD_SAFE"));
+               c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE"));
                c.name_len = sizeof("ZEND_THREAD_SAFE");
                c.value.value.lval = ZTS_V;
                c.value.type = IS_BOOL;
                zend_register_constant(&c TSRMLS_CC);
 
-               c.name = zend_strndup(ZEND_STRS("NULL"));
+               c.name = zend_strndup(ZEND_STRL("NULL"));
                c.name_len = sizeof("NULL");
                c.value.type = IS_NULL;
                zend_register_constant(&c TSRMLS_CC);

diff --git a/ext/ncurses/ncurses_functions.c b/ext/ncurses/ncurses_functions.c
index 90d416eb46f2e452dc4733645bcbe1c53a2dadb4..7a770a009f960463c6e11c43e0396be7ebe2927c 100644 (file)
--- a/ext/ncurses/ncurses_functions.c
+++ b/ext/ncurses/ncurses_functions.c
@@ -149,7 +149,7 @@ PHP_FUNCTION(ncurses_init)
                c.value = *zscr;
                zval_copy_ctor(&c.value);
                c.flags = CONST_CS;
-               c.name = zend_strndup(ZEND_STRS("STDSCR"));
+               c.name = zend_strndup(ZEND_STRL("STDSCR"));
                c.name_len = sizeof("STDSCR");
                zend_register_constant(&c TSRMLS_CC);
 
@@ -162,7 +162,7 @@ PHP_FUNCTION(ncurses_init)
                c.value = *zscr;            \
                zval_copy_ctor(&c.value);   \
                c.flags = CONST_CS;         \
-               c.name = zend_strndup(ZEND_STRS("NCURSES_" #x)); \
+               c.name = zend_strndup(ZEND_STRL("NCURSES_" #x)); \
                c.name_len = sizeof("NCURSES_" #x);                           \
                zend_register_constant(&c TSRMLS_CC)
                

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index ea0b0346a27ab7c0a622db8ae17f11add5248558..6ab3bb78222b41eccd2381ef4e5f1ef343a8977e 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -455,21 +455,21 @@ static void cli_register_file_handles(TSRMLS_D)
        
        ic.value = *zin;
        ic.flags = CONST_CS;
-       ic.name = zend_strndup(ZEND_STRS("STDIN"));
+       ic.name = zend_strndup(ZEND_STRL("STDIN"));
        ic.name_len = sizeof("STDIN");
        ic.module_number = 0;
        zend_register_constant(&ic TSRMLS_CC);
 
        oc.value = *zout;
        oc.flags = CONST_CS;
-       oc.name = zend_strndup(ZEND_STRS("STDOUT"));
+       oc.name = zend_strndup(ZEND_STRL("STDOUT"));
        oc.name_len = sizeof("STDOUT");
        oc.module_number = 0;
        zend_register_constant(&oc TSRMLS_CC);
 
        ec.value = *zerr;
        ec.flags = CONST_CS;
-       ec.name = zend_strndup(ZEND_STRS("STDERR"));
+       ec.name = zend_strndup(ZEND_STRL("STDERR"));
        ec.name_len = sizeof("STDERR");
        ec.module_number = 0;
        zend_register_constant(&ec TSRMLS_CC);