clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict

Browse Source
This commit is contained in:
Zeev Suraski 2004-01-10 12:48:04 +00:00
parent 840979858c
commit f5e9ca64b1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_operators.c
View File

@ -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;