Fix Win32 build. NULL_ZSTR was converted to ZSTR(NULL_ZSTR)

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 7a1082a22b089deb412a422603a8113a30df31a5..4ccf90aed26fba307284235d61a3a1c588e8d2f2 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1356,7 +1356,7 @@ static int spl_filesystem_file_read(spl_filesystem_object *intern, int silent TS
                        buf[line_len] = '\0';
                }
        } else {
-               buf = php_stream_get_line(intern->u.file.stream, NULL_ZSTR, 0, &line_len);
+               buf = php_stream_get_line(intern->u.file.stream, NULL, 0, &line_len);
        }
 
        if (!buf) {

diff --git a/ext/standard/file.c b/ext/standard/file.c
index b7e476fef1930ce409f132a64c69540522a60eb8..8989611ff7d0663663d421d0aa144d589a039a8e 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1049,7 +1049,7 @@ PHPAPI PHP_FUNCTION(fgets)
 
        php_stream_from_zval(stream, &zstream);
 
-       buf.v = php_stream_get_line_ex(stream, stream->readbuf_type, NULL_ZSTR, 0, length, &retlen);
+       buf.v = php_stream_get_line_ex(stream, stream->readbuf_type, NULL, 0, length, &retlen);
        if (!buf.v) {
                RETURN_FALSE;
        }
@@ -1110,7 +1110,7 @@ PHPAPI PHP_FUNCTION(fgetss)
        php_stream_from_zval(stream, &zstream);
 
        if (stream->readbuf_type == IS_UNICODE) {
-               UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL_ZSTR, 0, length, &retlen);
+               UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL, 0, length, &retlen);
                UChar *allowed = NULL;
                int allowed_len = 0;
 
@@ -1127,7 +1127,7 @@ PHPAPI PHP_FUNCTION(fgetss)
 
                RETURN_UNICODEL(buf, retlen, 0);
        } else { /* IS_STRING */
-               char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL_ZSTR, 0, length, &retlen);
+               char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL, 0, length, &retlen);
                char *allowed = NULL;
                int allowed_len = 0;
 
@@ -1189,7 +1189,7 @@ PHP_FUNCTION(fscanf)
        }
 
 
-       buf = php_stream_get_line((php_stream *) what, NULL_ZSTR, 0, &len);
+       buf = php_stream_get_line((php_stream *) what, NULL, 0, &len);
        if (buf == NULL) {
                efree(args);
                RETURN_FALSE;
@@ -2056,7 +2056,7 @@ PHP_FUNCTION(fgetcsv)
        }
 
        if (len < 0) {
-               if ((buf = php_stream_get_line(stream, NULL_ZSTR, 0, &buf_len)) == NULL) {
+               if ((buf = php_stream_get_line(stream, NULL, 0, &buf_len)) == NULL) {
                        RETURN_FALSE;
                }
        } else {
@@ -2153,7 +2153,7 @@ PHP_FUNCTION(fgetcsv)
                                                                memcpy(tptr, line_end, line_end_len);
                                                                tptr += line_end_len;
 
-                                                               if ((new_buf = php_stream_get_line(stream, NULL_ZSTR, 0, &new_len)) == NULL) {
+                                                               if ((new_buf = php_stream_get_line(stream, NULL, 0, &new_len)) == NULL) {
                                                                        /* we've got an unterminated enclosure,
                                                                         * assign all the data from the start of
                                                                         * the enclosure to end of data to the

diff --git a/ext/standard/image.c b/ext/standard/image.c
index d23ad781ec453f3b8143432994bf81454851ffe7..6d0751aea1b1babfdf86d52895d40c783c0d4ee3 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -1023,7 +1023,7 @@ static int php_get_xbm(php_stream *stream, struct gfxinfo **result TSRMLS_DC)
        if (php_stream_rewind(stream)) {
                return 0;
        }
-       while ((fline=php_stream_gets(stream, NULL_ZSTR, 0)) != NULL) {
+       while ((fline=php_stream_gets(stream, NULL, 0)) != NULL) {
                iname = estrdup(fline); /* simple way to get necessary buffer of required size */
                if (sscanf(fline, "#define %s %d", iname, &value) == 2) {
                        if (!(type = strrchr(iname, '_'))) {

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 476d0d6c7934aaffd5d8911744d20c77ba0e9dde..864975414caa323ec496e154385ccb36e0d064c3 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1146,7 +1146,7 @@ int main(int argc, char *argv[])
                                Z_LVAL_P(argi) = index;
                                INIT_PZVAL(argi);
                                zend_hash_update(&EG(symbol_table), "argi", sizeof("argi"), &argi, sizeof(zval *), NULL);
-                               while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL_ZSTR, 0)) != NULL) {
+                               while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL, 0)) != NULL) {
                                        len = strlen(input);
                                        while (len-- && (input[len]=='\n' || input[len]=='\r')) {
                                                input[len] = '\0';