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

# Based on patch by CoreyStup at gmail dot com

diff --git a/NEWS b/NEWS
index a05a36ebefe1afd5af7de91ecaca3bcb4801454a..e1f51a9b49ea4bdfe9451da116d2de47406182f5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,10 @@ PHP                                                                        NEWS
   (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

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 0ebd6efa066a2644b020b24a331b3a99dbb2f13b..42f636ea8c69da98fbb538106969c0fdf763eca8 100644 (file)
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -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

diff --git a/ext/hash/php_hash_tiger.h b/ext/hash/php_hash_tiger.h
index 74ae2a97a98ad3fb898f977a60d8a56e970d92da..8a8dc7011eaad42b446780156562dfbc17da53d9 100644 (file)
--- a/ext/hash/php_hash_tiger.h
+++ b/ext/hash/php_hash_tiger.h
@@ -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;
 

diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 395bd4eec09787fb87418c88f9bdcf326dcd2344..ca818b07ea63fc2a831c7125ad024e1dede402b3 100755 (executable)
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -183,7 +183,7 @@ enum pdo_case_conversion {
 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 @@ enum pdo_param_event {
        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);