diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-09 16:12:13 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-09 16:12:13 +0300 |
| commit | a5e86d82643e1fc718c356f9a6dc4a2daa31e7be (patch) | |
| tree | 65f8b3aa50d4f3a15cf3361403ed5a620296c5d5 /ext/ffi | |
| parent | ec5d4c79d28fa9e12a213e24b491c5e21673e5d7 (diff) | |
| download | php-git-a5e86d82643e1fc718c356f9a6dc4a2daa31e7be.tar.gz | |
Fixed ext/ffi/tests/044.phpt failure on 32-bit Linux
Diffstat (limited to 'ext/ffi')
| -rw-r--r-- | ext/ffi/ffi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index e124995c50..c47128e01a 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -5004,18 +5004,12 @@ static void zend_ffi_finalize_type(zend_ffi_dcl *dcl) /* {{{ */ dcl->type = (zend_ffi_type*)&zend_ffi_type_uint64; } break; -#ifdef _WIN32 - case ZEND_FFI_DCL_LONG_LONG: -#endif case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG: case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_SIGNED: case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_INT: case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_SIGNED|ZEND_FFI_DCL_INT: dcl->type = (zend_ffi_type*)&zend_ffi_type_sint64; break; -#ifdef _WIN32 - case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_UNSIGNED: -#endif case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_UNSIGNED: case ZEND_FFI_DCL_LONG_LONG|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_UNSIGNED|ZEND_FFI_DCL_INT: dcl->type = (zend_ffi_type*)&zend_ffi_type_uint64; @@ -6144,7 +6138,7 @@ void zend_ffi_add_attribute_value(zend_ffi_dcl *dcl, const char *name, size_t na if (sizeof(long) == 8) { dcl->flags |= ZEND_FFI_DCL_LONG; } else { - dcl->flags |= ZEND_FFI_DCL_LONG_LONG; + dcl->flags |= ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_LONG_LONG; } break; } |