From: Moriyoshi Koizumi Date: Sun, 5 Oct 2003 13:59:15 +0000 (+0000) Subject: Fix the macro to prevent it from falling over in a mess X-Git-Tag: RELEASE_1_3b3~124 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c95c42404cc55bfed6ec785d248b9f34e05fecf;p=php Fix the macro to prevent it from falling over in a mess --- diff --git a/ext/standard/file.c b/ext/standard/file.c index c952903463..8f0c5a6eb7 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1714,7 +1714,7 @@ PHPAPI PHP_FUNCTION(fread) # 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))) +# 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