cvs: ZendEngine2 / zend_operators.c
| From: | Zeev Suraski | Date: | Sat, 10 Jan 2004 12:48:04 +0000 |
| Subject: | cvs: ZendEngine2 / zend_operators.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2199@lists.php.net to get a copy of this message | ||
zeev Sat Jan 10 07:48:04 2004 EDT
Modified files:
/ZendEngine2 zend_operators.c
Log:
Remove conflict
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.174 ZendEngine2/zend_operators.c:1.175
--- ZendEngine2/zend_operators.c:1.174 Sat Jan 10 06:43:42 2004
+++ ZendEngine2/zend_operators.c Sat Jan 10 07:48:04 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.174 2004/01/10 11:43:42 zeev Exp $ */
+/* $Id: zend_operators.c,v 1.175 2004/01/10 12:48:04 zeev Exp $ */
#include <ctype.h>
@@ -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;