diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-07-13 23:59:54 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-07-13 23:59:54 +0000 |
| commit | aeb1dc7cc4e43501b832bb120f1bebb7b254395e (patch) | |
| tree | a906c64eb3de42928197db75a6e0e64aeb5ad03c | |
| parent | fcb098499159b50421c58817177a69543a2b5205 (diff) | |
| download | php-git-aeb1dc7cc4e43501b832bb120f1bebb7b254395e.tar.gz | |
Fixed bug #51943 (Several files are out of ANSI spec)
# Based on patch by CoreyStup at gmail dot com
| -rw-r--r-- | ext/date/lib/parse_date.c | 2 | ||||
| -rw-r--r-- | ext/hash/php_hash_tiger.h | 4 | ||||
| -rwxr-xr-x | ext/pdo/php_pdo_driver.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index f193ff4e66..4370f96c69 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 92280063c3..6f5f6dbfc7 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 */ @@ -349,7 +349,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); |