cvs: php4 /main rfc1867.c

sniper Sat Jul 13 20:27:52 2002 EDT Modified files: /php4/main rfc1867.c Log: IF --disable-mbstr-enc-trans is used OR mbstring is compiled as shared extension, these functions are not available. Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.108 php4/main/rfc1867.c:1.109 --- php4/main/rfc1867.c:1.108 Thu Jul 11 21:49:58 2002 +++ php4/main/rfc1867.c Sat Jul 13 20:27:52 2002 @@ -16,7 +16,7 @@ | Jani Taskinen <sniper@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.108 2002/07/12 01:49:58 sniper Exp $ */ +/* $Id: rfc1867.c,v 1.109 2002/07/14 00:27:52 sniper Exp $ */ /* * This product includes software developed by the Apache Group @@ -32,7 +32,7 @@ #include "php_variables.h" #include "rfc1867.h" -#if HAVE_MBSTRING +#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING) #include "ext/mbstring/mbstring.h" #endif @@ -459,7 +459,7 @@ *resp++ = start[++i]; } else { *resp++ = start[i]; -#if HAVE_MBSTRING +#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING) if (mbstr_is_mb_leadbyte(start+i TSRMLS_CC)) { *resp++ = start[++i]; } @@ -840,7 +840,7 @@ sprintf(lbuf, "%s_name", param); } -#if HAVE_MBSTRING +#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING) s = mbstr_strrchr(filename, '\\' TSRMLS_CC); #else s = strrchr(filename, '\\');