archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source
This commit is contained in:
Nikita Popov 2018-11-13 12:31:44 +01:00
commit 12cbe930cd
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_string.c
View file

@ -376,7 +376,7 @@ ZEND_API zend_bool ZEND_FASTCALL I_WRAP_SONAME_FNNAME_ZU(NONE,zend_string_equal_
}
#endif
#elif defined(__GNUC__) && defined(__x86_64__)
#elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2)
{
char *ptr = ZSTR_VAL(s1);

2
Zend/zend_string.h
View file

@ -293,7 +293,7 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, int persis
}
}
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
#if defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__ILP32__)))
BEGIN_EXTERN_C()
ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
END_EXTERN_C()

2
ext/opcache/zend_accelerator_util_funcs.c
View file

@ -609,7 +609,7 @@ static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t s
: "r"(delta)
: "cc", "memory", "%xmm0", "%xmm1", "%xmm1", "%xmm2");
}
# elif defined(__GNUC__) && defined(__x86_64__)
# elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size)
{
size_t delta = (char*)dest - (char*)src;