Expose the macro globally

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 55c0096ba271a85b05470241de4b00da053d4370..c580714713b96b527a8e857f012d8ac7099af9d2 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1718,28 +1718,18 @@ PHPAPI PHP_FUNCTION(fread)
 }
 /* }}} */
 
-#ifndef HAVE_MBLEN
-# define _php_mblen(ptr, len) 1
-#else
-# if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
-#  define _php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state)))
-# else
-#  define _php_mblen(ptr, len) mblen(ptr, len)
-# endif
-#endif
-
 static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t len, const char delimiter TSRMLS_DC)
 {
        int inc_len;
        unsigned char last_chars[2] = { 0, 0 };
 
        while (len > 0) {
-               inc_len = (*ptr == '\0' ? 1: _php_mblen(ptr, len));
+               inc_len = (*ptr == '\0' ? 1: php_mblen(ptr, len));
                switch (inc_len) {
                        case -2:
                        case -1:
                                inc_len = 1;
-                               _php_mblen(NULL, 0);
+                               php_mblen(NULL, 0);
                                break;
                        case 0:
                                goto quit_loop;
@@ -1839,7 +1829,7 @@ PHP_FUNCTION(fgetcsv)
                }
        }
        /* initialize internal state */
-       _php_mblen(NULL, 0);
+       php_mblen(NULL, 0);
 
        /* Now into new section that parses buf for delimiter/enclosure fields */
 
@@ -1868,12 +1858,12 @@ PHP_FUNCTION(fgetcsv)
 
                /* 1. Strip any leading space */
                for (;;) {
-                       inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0);
+                       inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
                        switch (inc_len) {
                                case -2:
                                case -1:
                                        inc_len = 1;
-                                       _php_mblen(NULL, 0);
+                                       php_mblen(NULL, 0);
                                        break;
                                case 0:
                                        goto quit_loop_0;
@@ -1897,7 +1887,7 @@ PHP_FUNCTION(fgetcsv)
 
                        /* 2A. handle enclosure delimited field */
                        for (;;) {
-                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0);
+                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
                                switch (inc_len) {
                                        case 0:
                                                switch (state) {
@@ -1958,7 +1948,7 @@ PHP_FUNCTION(fgetcsv)
 
                                        case -2:
                                        case -1:
-                                               _php_mblen(NULL, 0);
+                                               php_mblen(NULL, 0);
                                                /* break is omitted intentionally */
                                        case 1:
                                                /* we need to determine if the enclosure is
@@ -2021,7 +2011,7 @@ PHP_FUNCTION(fgetcsv)
                                        case -2:
                                        case -1:
                                                inc_len = 1;
-                                               _php_mblen(NULL, 0);
+                                               php_mblen(NULL, 0);
                                                /* break is omitted intentionally */
                                        case 1:
                                                if (*bptr == delimiter) {
@@ -2032,7 +2022,7 @@ PHP_FUNCTION(fgetcsv)
                                                break;
                                }
                                bptr += inc_len;
-                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0);
+                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
                        }
                quit_loop_3:
                        comp_end = tptr;
@@ -2046,14 +2036,14 @@ PHP_FUNCTION(fgetcsv)
                        hunk_begin = bptr;
 
                        for (;;) {
-                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0);
+                               inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
                                switch (inc_len) {
                                        case 0:
                                                goto quit_loop_4;
                                        case -2:
                                        case -1:
                                                inc_len = 1;
-                                               _php_mblen(NULL, 0);
+                                               php_mblen(NULL, 0);
                                                /* break is omitted intentionally */
                                        case 1:
                                                if (*bptr == delimiter) {

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index dac757b0501cd895ba58ef84a96d2a454b81d99b..a7882dba96b449477af1a026d5b95540ad13e823 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -144,6 +144,16 @@ PHPAPI char *php_strerror(int errnum);
 #define strerror php_strerror
 #endif
 
+#ifndef HAVE_MBLEN
+# define php_mblen(ptr, len) 1
+#else
+# if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
+#  define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state)))
+# else
+#  define php_mblen(ptr, len) mblen(ptr, len)
+# endif
+#endif
+
 void register_string_constants(INIT_FUNC_ARGS);
 
 #endif /* PHP_STRING_H */