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 > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
