php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source
This commit is contained in:
Nikita Popov
2019-03-18 10:14:19 +01:00
parent d0eb445f60 1b411c039f
commit 68d8880248
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_portability.h
+2 -6
View File
@@ -444,12 +444,8 @@ char *alloca();
#define MAX(a, b) (((a)>(b))?(a):(b))
#define MIN(a, b) (((a)<(b))?(a):(b))
/* x86 instructions BT, SHL, SHR don't require masking */
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) || defined(ZEND_WIN32)
# define ZEND_BIT_TEST(bits, bit) (((bits)[(bit) / (sizeof((bits)[0])*8)] >> (bit)) & 1)
#else
# define ZEND_BIT_TEST(bits, bit) (((bits)[(bit) / (sizeof((bits)[0])*8)] >> ((bit) & (sizeof((bits)[0])*8-1))) & 1)
#endif
#define ZEND_BIT_TEST(bits, bit) \
(((bits)[(bit) / (sizeof((bits)[0])*8)] >> ((bit) & (sizeof((bits)[0])*8-1))) & 1)
/* We always define a function, even if there's a macro or expression we could
* alias, so that using it in contexts where we can't make function calls
ext/date/php_date.c
+9 -10
View File
@@ -4675,20 +4675,19 @@ PHP_METHOD(DatePeriod, getDateInterval)
*/
PHP_METHOD(DatePeriod, getRecurrences)
{
php_period_obj *dpobj;
php_date_obj *dateobj;
php_period_obj *dpobj;
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (zend_parse_parameters_none() == FAILURE) {
return;
}
dpobj = Z_PHPPERIOD_P(ZEND_THIS);
dpobj = Z_PHPPERIOD_P(ZEND_THIS);
if (0 == dpobj->recurrences - dpobj->include_start_date) {
return;
}
if (0 == dpobj->recurrences - dpobj->include_start_date) {
return;
}
RETURN_LONG(dpobj->recurrences - dpobj->include_start_date);
RETURN_LONG(dpobj->recurrences - dpobj->include_start_date);
}
/* }}} */