diff options
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index c83fd08e03..2051235c7d 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -33,8 +33,13 @@ #include "ext/bcmath/number.h" #endif +<<<<<<< zend_operators.c +#define LONG_SIGN_MASK (1L << (8*SIZEOF_LONG-1)) + +======= #define LONG_SIGN_MASK (1L << (8*sizeof(long)-1)) +>>>>>>> 1.162 ZEND_API int zend_atoi(const char *str, int str_len) { int retval; |