diff options
| author | Zeev Suraski <zeev@php.net> | 2004-01-10 12:48:04 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-01-10 12:48:04 +0000 |
| commit | f5e9ca64b147b0b751243b9e5211ffb6c878fbd6 (patch) | |
| tree | 3f36449c2225160ed98bd8547dbe8f30cb5acd15 /Zend/zend_operators.c | |
| parent | 840979858cc00ea1e835fdb7faa6bd1e253fc05a (diff) | |
| download | php-git-f5e9ca64b147b0b751243b9e5211ffb6c878fbd6.tar.gz | |
Remove conflict
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 2051235c7d..c83fd08e03 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -33,13 +33,8 @@ #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; |