From f5e9ca64b147b0b751243b9e5211ffb6c878fbd6 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 10 Jan 2004 12:48:04 +0000 Subject: [PATCH] Remove conflict --- Zend/zend_operators.c | 5 ----- 1 file changed, 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; -- 2.40.0