diff options
| author | tduehr <td@matasano.com> | 2016-01-21 09:18:37 -0600 |
|---|---|---|
| committer | tduehr <td@matasano.com> | 2016-01-21 09:18:37 -0600 |
| commit | ce0e712bcb8876620e10c892d0b9005c84d92b53 (patch) | |
| tree | 94e04cbd7c69728065fd4406b582c6b34cbda545 | |
| parent | 36c9248c079150111c892cc11a7694b6490841b8 (diff) | |
| parent | 2c27a851a6294e9dd9e7ef2af1dd63b9b257acc3 (diff) | |
| download | ffi-ce0e712bcb8876620e10c892d0b9005c84d92b53.tar.gz | |
Merge pull request #474 from lzmths/master
Refactoring conditional directives that break parts of statements.
| -rw-r--r-- | ext/ffi_c/libffi/src/mips/ffi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/ffi_c/libffi/src/mips/ffi.c b/ext/ffi_c/libffi/src/mips/ffi.c index 79cff9b..a7acb8a 100644 --- a/ext/ffi_c/libffi/src/mips/ffi.c +++ b/ext/ffi_c/libffi/src/mips/ffi.c @@ -76,6 +76,7 @@ static void ffi_prep_args(char *stack, void **p_argv; char *argp; ffi_type **p_arg; + int ecif_test; #ifdef FFI_MIPS_N32 /* If more than 8 double words are used, the remainder go @@ -92,10 +93,11 @@ static void ffi_prep_args(char *stack, memset(stack, 0, bytes); #ifdef FFI_MIPS_N32 - if ( ecif->cif->rstruct_flag != 0 ) + ecif_test = ecif->cif->rstruct_flag != 0; #else - if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT ) + ecif_test = ecif->cif->rtype->type == FFI_TYPE_STRUCT; #endif + if (ecif_test) { *(ffi_arg *) argp = (ffi_arg) ecif->rvalue; argp += sizeof(ffi_arg); |