kalle                                    Tue, 13 Jul 2010 23:59:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301252

Log:
Fixed bug #51943 (Several files are out of ANSI spec)

# Based on patch by CoreyStup at gmail dot com

Bug: http://bugs.php.net/51943 (Assigned) Several files are out of ANSI spec
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c
    U   php/php-src/branches/PHP_5_2/ext/hash/php_hash_tiger.h
    U   php/php-src/branches/PHP_5_2/ext/pdo/php_pdo_driver.h
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c
    U   php/php-src/branches/PHP_5_3/ext/hash/php_hash_tiger.h
    U   php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h
    U   php/php-src/trunk/ext/date/lib/parse_date.c
    U   php/php-src/trunk/ext/hash/php_hash_tiger.h
    U   php/php-src/trunk/ext/pdo/php_pdo_driver.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2010-07-13 19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-07-13 23:59:54 UTC (rev 301252)
@@ -8,8 +8,10 @@
   (Johannes)
 - Fixed bug #52237 (Crash when passing the reference of the property of a
   non-object). (Dmitry)
-- Fixed bug #52037 (Concurrent builds fail in install-programs) (seanius at
+- Fixed bug #52037 (Concurrent builds fail in install-programs). (seanius at
   debian dot org, Kalle)
+- Fixed bug #51943 (AIX: Several files are out of ANSI spec). (Kalle,
+  coreystup at gmail dot com)

 01 Jul 2010, PHP 5.2.14RC2
 - Fixed a possible interruption array leak in strrchr(). Reported by

Modified: php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c      2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c      2010-07-13 
23:59:54 UTC (rev 301252)
@@ -88,6 +88,8 @@

 #define TIMELIB_ERROR          999

+/* Some compilers like AIX, defines uchar in sys/types.h */
+#undef uchar
 typedef unsigned char uchar;

 #define   BSIZE           8192

Modified: php/php-src/branches/PHP_5_2/ext/hash/php_hash_tiger.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/hash/php_hash_tiger.h      2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_2/ext/hash/php_hash_tiger.h      2010-07-13 
23:59:54 UTC (rev 301252)
@@ -25,8 +25,8 @@
 typedef struct {
        php_hash_uint64 state[3];
        php_hash_uint64 passed;
-       unsigned char passes:1;
-       unsigned char length:7;
+       unsigned int passes:1;
+       unsigned int length:7;
        unsigned char buffer[64];
 } PHP_TIGER_CTX;


Modified: php/php-src/branches/PHP_5_2/ext/pdo/php_pdo_driver.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/php_pdo_driver.h       2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_2/ext/pdo/php_pdo_driver.h       2010-07-13 
23:59:54 UTC (rev 301252)
@@ -183,7 +183,7 @@
 enum pdo_null_handling {
        PDO_NULL_NATURAL = 0,
        PDO_NULL_EMPTY_STRING = 1,
-       PDO_NULL_TO_STRING = 2,
+       PDO_NULL_TO_STRING = 2
 };

 /* {{{ utils for reading attributes set as driver_options */
@@ -343,7 +343,7 @@
        PDO_PARAM_EVT_EXEC_POST,
        PDO_PARAM_EVT_FETCH_PRE,
        PDO_PARAM_EVT_FETCH_POST,
-       PDO_PARAM_EVT_NORMALIZE,
+       PDO_PARAM_EVT_NORMALIZE
 };

 typedef int (*pdo_stmt_param_hook_func)(pdo_stmt_t *stmt, struct 
pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC);

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-07-13 19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-07-13 23:59:54 UTC (rev 301252)
@@ -10,8 +10,10 @@
   results and PHP crashes). (Felipe)
 - Fixed bug #52238 (Crash when an Exception occured in iterator_to_array).
   (Johannes)
-- Fixed bug #52037 (Concurrent builds fail in install-programs) (seanius at
+- Fixed bug #52037 (Concurrent builds fail in install-programs). (seanius at
   debian dot org, Kalle)
+- Fixed bug #51943 (AIX: Several files are out of ANSI spec). (Kalle,
+  coreystup at gmail dot com)
 - Fixed bug #51697 (Unsafe operations in free_storage of SPL iterators,
   causes crash during shutdown). (Etienne)


Modified: php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c      2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c      2010-07-13 
23:59:54 UTC (rev 301252)
@@ -91,6 +91,8 @@

 #define TIMELIB_ERROR          999

+/* Some compilers like AIX, defines uchar in sys/types.h */
+#undef uchar
 typedef unsigned char uchar;

 #define   BSIZE           8192

Modified: php/php-src/branches/PHP_5_3/ext/hash/php_hash_tiger.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/hash/php_hash_tiger.h      2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_3/ext/hash/php_hash_tiger.h      2010-07-13 
23:59:54 UTC (rev 301252)
@@ -25,8 +25,8 @@
 typedef struct {
        php_hash_uint64 state[3];
        php_hash_uint64 passed;
-       unsigned char passes:1;
-       unsigned char length:7;
+       unsigned int passes:1;
+       unsigned int length:7;
        unsigned char buffer[64];
 } PHP_TIGER_CTX;


Modified: php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h       2010-07-13 
19:45:07 UTC (rev 301251)
+++ php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h       2010-07-13 
23:59:54 UTC (rev 301252)
@@ -188,7 +188,7 @@
 enum pdo_null_handling {
        PDO_NULL_NATURAL = 0,
        PDO_NULL_EMPTY_STRING = 1,
-       PDO_NULL_TO_STRING = 2,
+       PDO_NULL_TO_STRING = 2
 };

 /* {{{ utils for reading attributes set as driver_options */
@@ -348,7 +348,7 @@
        PDO_PARAM_EVT_EXEC_POST,
        PDO_PARAM_EVT_FETCH_PRE,
        PDO_PARAM_EVT_FETCH_POST,
-       PDO_PARAM_EVT_NORMALIZE,
+       PDO_PARAM_EVT_NORMALIZE
 };

 typedef int (*pdo_stmt_param_hook_func)(pdo_stmt_t *stmt, struct 
pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC);

Modified: php/php-src/trunk/ext/date/lib/parse_date.c
===================================================================
--- php/php-src/trunk/ext/date/lib/parse_date.c 2010-07-13 19:45:07 UTC (rev 
301251)
+++ php/php-src/trunk/ext/date/lib/parse_date.c 2010-07-13 23:59:54 UTC (rev 
301252)
@@ -91,6 +91,8 @@

 #define TIMELIB_ERROR          999

+/* Some compilers like AIX, defines uchar in sys/types.h */
+#undef uchar
 typedef unsigned char uchar;

 #define   BSIZE           8192

Modified: php/php-src/trunk/ext/hash/php_hash_tiger.h
===================================================================
--- php/php-src/trunk/ext/hash/php_hash_tiger.h 2010-07-13 19:45:07 UTC (rev 
301251)
+++ php/php-src/trunk/ext/hash/php_hash_tiger.h 2010-07-13 23:59:54 UTC (rev 
301252)
@@ -25,8 +25,8 @@
 typedef struct {
        php_hash_uint64 state[3];
        php_hash_uint64 passed;
-       unsigned char passes:1;
-       unsigned char length:7;
+       unsigned int passes:1;
+       unsigned int length:7;
        unsigned char buffer[64];
 } PHP_TIGER_CTX;


Modified: php/php-src/trunk/ext/pdo/php_pdo_driver.h
===================================================================
--- php/php-src/trunk/ext/pdo/php_pdo_driver.h  2010-07-13 19:45:07 UTC (rev 
301251)
+++ php/php-src/trunk/ext/pdo/php_pdo_driver.h  2010-07-13 23:59:54 UTC (rev 
301252)
@@ -188,7 +188,7 @@
 enum pdo_null_handling {
        PDO_NULL_NATURAL = 0,
        PDO_NULL_EMPTY_STRING = 1,
-       PDO_NULL_TO_STRING = 2,
+       PDO_NULL_TO_STRING = 2
 };

 /* {{{ utils for reading attributes set as driver_options */
@@ -349,7 +349,7 @@
        PDO_PARAM_EVT_EXEC_POST,
        PDO_PARAM_EVT_FETCH_PRE,
        PDO_PARAM_EVT_FETCH_POST,
-       PDO_PARAM_EVT_NORMALIZE,
+       PDO_PARAM_EVT_NORMALIZE
 };

 typedef int (*pdo_stmt_param_hook_func)(pdo_stmt_t *stmt, struct 
pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC);

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

Reply via email to