]>
Commit | Line | Data |
---|---|---|
4229a1f8 AM |
1 | diff -urbBN php-5.0.5.org/ext/mbstring/config.m4 php-5.0.5/ext/mbstring/config.m4 |
2 | --- php-5.0.5.org/ext/mbstring/config.m4 2005-02-21 00:02:48.000000000 +0100 | |
3 | +++ php-5.0.5/ext/mbstring/config.m4 2005-10-28 08:39:45.000000000 +0200 | |
4 | @@ -1,5 +1,5 @@ | |
5 | dnl | |
6 | -dnl $Id$ | |
7 | +dnl $Id$ | |
8 | dnl | |
9 | ||
10 | AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ | |
11 | @@ -55,7 +55,8 @@ | |
12 | AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ | |
13 | if test "$PHP_MBREGEX" = "yes"; then | |
14 | AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [ | |
15 | - AC_TRY_COMPILE([#include <stdarg.h>], [ | |
16 | + AC_TRY_RUN([ | |
17 | +#include <stdarg.h> | |
18 | int foo(int x, ...) { | |
19 | va_list va; | |
20 | va_start(va, x); | |
21 | @@ -65,7 +66,19 @@ | |
22 | return 0; | |
23 | } | |
24 | int main() { return foo(10, "", 3.14); } | |
25 | - ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no]) | |
26 | + ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], | |
27 | + [ | |
28 | + dnl cross-compile needs something here | |
29 | +case $host_alias in | |
30 | +*netware*) | |
31 | +cv_php_mbstring_stdarg=yes | |
32 | +;; | |
33 | +*) | |
34 | +cv_php_mbstring_stdarg=no | |
35 | +;; | |
36 | +esac | |
37 | +] | |
38 | +) | |
39 | ]) | |
40 | ||
41 | AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h]) | |
42 | diff -urbBN php-5.0.5.org/ext/mbstring/libmbfl/mbfl/mbfilter.c php-5.0.5/ext/mbstring/libmbfl/mbfl/mbfilter.c | |
43 | --- php-5.0.5.org/ext/mbstring/libmbfl/mbfl/mbfilter.c 2005-04-22 07:03:25.000000000 +0200 | |
44 | +++ php-5.0.5/ext/mbstring/libmbfl/mbfl/mbfilter.c 2005-11-05 06:46:40.000000000 +0100 | |
45 | @@ -1990,7 +1990,7 @@ | |
46 | break; | |
47 | ||
48 | default: /* ASCII */ | |
49 | - if (!qp_table[(c & 0xff)]) { /* ordinary characters */ | |
50 | + if (c <= 0x00ff && !qp_table[(c & 0xff)]) { /* ordinary characters */ | |
51 | mbfl_memory_device_output(c, &pe->tmpdev); | |
52 | pe->status1 = 1; | |
53 | } else if (pe->status1 == 0 && c == 0x20) { /* repeat SPACE */ |