From e71ee33358c7dc4efdb52af5bd89f548d86b3561 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Tue, 13 Jul 2010 23:59:54 +0000 Subject: [PATCH] Fixed bug #51943 (Several files are out of ANSI spec) # Based on patch by CoreyStup at gmail dot com --- NEWS | 4 +++- ext/date/lib/parse_date.c | 2 ++ ext/hash/php_hash_tiger.h | 4 ++-- ext/pdo/php_pdo_driver.h | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index b5d0e4ee0b..cfbbe1460f 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,10 @@ PHP NEWS 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) diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 3d76fa8b98..fb09a3d6e6 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -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 diff --git a/ext/hash/php_hash_tiger.h b/ext/hash/php_hash_tiger.h index 74ae2a97a9..8a8dc7011e 100644 --- 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 06d09b2d17..683e36b562 100755 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -188,7 +188,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 */ @@ -348,7 +348,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); -- 2.40.0