johannes                Tue Nov  7 15:19:11 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/spl    spl_iterators.c 
    /php-src    NEWS 
  Log:
  - MFH: No C++ comments (fix #39414)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.19&r2=1.73.2.30.2.20&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.19 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.20
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.19      Mon Nov  6 23:20:11 2006
+++ php-src/ext/spl/spl_iterators.c     Tue Nov  7 15:19:11 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.19 2006/11/06 23:20:11 bjori Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.20 2006/11/07 15:19:11 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1487,7 +1487,7 @@
 
        if (mode < 0 || mode >= REGIT_MODE_MAX) {
                zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 
TSRMLS_CC, "Illegal mode %ld", mode);
-               return;// NULL
+               return;/* NULL */
        }
 
        intern->u.regex.mode = mode;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.334&r2=1.2027.2.547.2.335&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.334 php-src/NEWS:1.2027.2.547.2.335
--- php-src/NEWS:1.2027.2.547.2.334     Mon Nov  6 17:21:05 2006
+++ php-src/NEWS        Tue Nov  7 15:19:11 2006
@@ -13,6 +13,8 @@
     php_filter.h).
 - Fixed wrong signature initialization in imagepng (Takeshi Abe)
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39414 (Syntax error while compiling with Sun Workshop Complier).
+  (Johannes)
 - Fixed bug #39366 (imagerotate does not use alpha with angle > 45°) (Pierre)
 - Fixed bug #39362 (Added an option to imap_open/imap_reopen to control the 
   number of connection retries). (Ilia)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to