Re: cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html
onigcmpt200.h oniggnu.h oniguruma.h regcomp.c regenc.c regenc.h regerror.c regexec.c regext.c reggnu.c regint.h regparse.c regparse.h regposix.c
regsyntax.c regversion.c st.c st.h /ext/mbstring/oniguruma/enc big5.c euc_jp.c euc_kr.c euc_tw.c iso8859_1.c iso8859_10.c iso8859_11.c iso8859_13.c
iso8859_14.c iso8859_15.c iso8859_16.c iso8859_2.c iso8859_3.c iso8859_4.c iso8859_5.c iso8859_6.c iso8859_7.c iso8859_8.c iso8859_9.c koi8.c koi8_r.c
sjis.c unicode.c utf16_be.c utf16_le.c utf32_be.c utf32_le.c utf8.c /ext/mbstring/oniguruma/win32 config.h
| From: | Seiji Masugata | Date: | Thu, 27 Jul 2006 08:31:02 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c regenc.c regenc.h regerror.c regexec.c regext.c reggnu.c regint.h regparse.c regparse.h regposix.c regsyntax.c regversion.c st.c st.h /ext/mbstring/oniguruma/enc big5.c euc_jp.c euc_kr.c euc_tw.c iso8859_1.c iso8859_10.c iso8859_11.c iso8859_13.c iso8859_14.c iso8859_15.c iso8859_16.c iso8859_2.c iso8859_3.c iso8859_4.c iso8859_5.c iso8859_6.c iso8859_7.c iso8859_8.c iso8859_9.c koi8.c koi8_r.c sjis.c unicode.c utf16_be.c utf16_le.c utf32_be.c utf32_le.c utf8.c /ext/mbstring/oniguruma/win32 config.h |
||
| References: | 1 2 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-39571@lists.php.net to get a copy of this message | ||
Hi, Antony.
> This code doesn't compile with Intel Compiler anymore (but works fine with GCC).
> Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.
Oh... very sorry.
It contacts the author as corrected.
> I've fixed it in CVS, please make sure this change doesn't affect the functionality
> of the code.
Ok, confirms it. :)
Thank you.
--
Seiji Masugata
On Thu, 27 Jul 2006 10:40:25 +0300
Antony Dovgal wrote:
> On 20.07.2006 18:45, Seiji Masugata wrote:
> > masugata Thu Jul 20 15:45:08 2006 UTC
> >
> > http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regerror.c?r1=1.3&r2=1.3.4.1&diff_format=u
> > Index: php-src/ext/mbstring/oniguruma/regerror.c
> > diff -u php-src/ext/mbstring/oniguruma/regerror.c:1.3
> > php-src/ext/mbstring/oniguruma/regerror.c:1.3.4.1
> > --- php-src/ext/mbstring/oniguruma/regerror.c:1.3 Sun Feb 20 22:18:08 2005
> > +++ php-src/ext/mbstring/oniguruma/regerror.c Thu Jul 20 15:45:07 2006
> <skipped>
> > @@ -256,36 +258,36 @@
> >
> > void
> > #ifdef HAVE_STDARG_PROTOTYPES
> > -onig_snprintf_with_pattern(char buf[], int bufsize, OnigEncoding enc,
> > - char* pat, char* pat_end, char *fmt, ...)
> > +onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
> > + UChar* pat, UChar* pat_end, const UChar *fmt, ...)
> > #else
> > onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
> > - char buf[];
> > + UChar buf[];
> > int bufsize;
> > OnigEncoding enc;
> > - char* pat;
> > - char* pat_end;
> > - const char *fmt;
> > + UChar* pat;
> > + UChar* pat_end;
> > + const UChar *fmt;
> > va_dcl
> > #endif
> > {
> > int n, need, len;
> > UChar *p, *s, *bp;
> > - char bs[6];
> > + UChar bs[6];
> > va_list args;
> >
> > - va_init_list(args, fmt);
> > - n = vsnprintf(buf, bufsize, fmt, args);
> > + va_init_list(args, (const char* )fmt);
> ^^^^^^^^^^^^^^^^^
> This code doesn't compile with Intel Compiler anymore (but works fine with GCC).
> Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.
> I've fixed it in CVS, please make sure this change doesn't affect the functionality
> of the code.
>
> --
> Wbr,
> Antony Dovgal
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>