diff options
| author | Derick Rethans <derick@php.net> | 2004-11-29 09:32:15 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2004-11-29 09:32:15 +0000 |
| commit | ebca90f075a4a804c67a0b1c975ad346c91eddbf (patch) | |
| tree | aedcfff5253e4138c9eb09934d077d16fa94f9bf /Zend/zend_operators.c | |
| parent | 463204f9b344f2f5160a55a56f716885374a72d8 (diff) | |
| download | php-git-ebca90f075a4a804c67a0b1c975ad346c91eddbf.tar.gz | |
- MFH: Revert Joe's work around a bug in GCC patch as it breaks too many things.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 8a26e5d411..cf63461668 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -184,15 +184,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) } -#define DVAL_TO_LVAL(d, l) do { \ - if ((d) >= LONG_MAX) { \ - l = LONG_MAX; \ - } else if ((d) < LONG_MIN) { \ - l = LONG_MIN; \ - } else { \ - l = (d); \ - } \ -} while (0) +#define DVAL_TO_LVAL(d, l) (l) = (d) > LONG_MAX ? (unsigned long) (d) : (long) (d) #define zendi_convert_to_long(op, holder, result) \ if (op == result || op->refcount == 0) { \ |