Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typo
This commit is contained in:
Christoph M. Becker 2019-05-05 15:41:05 +02:00
commit af8dc55601

View file

@ -6061,7 +6061,7 @@ void zend_ffi_add_attribute_value(zend_ffi_dcl *dcl, const char *name, size_t na
&& val->i64 > 0 && val->i64 <= 0x80000000 && (val->i64 & (val->i64 - 1)) == 0) { && val->i64 > 0 && val->i64 <= 0x80000000 && (val->i64 & (val->i64 - 1)) == 0) {
dcl->align = val->i64; dcl->align = val->i64;
} else { } else {
zend_ffi_parser_error("incorrect 'alignemnt' value at line %d", FFI_G(line)); zend_ffi_parser_error("incorrect 'alignment' value at line %d", FFI_G(line));
} }
break; break;
case attr_mode: case attr_mode:
@ -6137,7 +6137,7 @@ void zend_ffi_add_msvc_attribute_value(zend_ffi_dcl *dcl, const char *name, size
&& val->i64 > 0 && val->i64 <= 0x80000000 && (val->i64 & (val->i64 - 1)) == 0) { && val->i64 > 0 && val->i64 <= 0x80000000 && (val->i64 & (val->i64 - 1)) == 0) {
dcl->align = val->i64; dcl->align = val->i64;
} else { } else {
zend_ffi_parser_error("incorrect 'alignemnt' value at line %d", FFI_G(line)); zend_ffi_parser_error("incorrect 'alignment' value at line %d", FFI_G(line));
} }
} else { } else {
/* ignore */ /* ignore */