From 556ea3915a6b4f1ee4a81a73175b715663b836e2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 2 Nov 2012 23:17:05 +0000 Subject: [PATCH] runtime: Fix reflect.Call support for 64-bit ints. From-SVN: r193110 --- libgo/runtime/go-reflect-call.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libgo/runtime/go-reflect-call.c b/libgo/runtime/go-reflect-call.c index 6455ff13567..06edae45026 100644 --- a/libgo/runtime/go-reflect-call.c +++ b/libgo/runtime/go-reflect-call.c @@ -75,15 +75,15 @@ go_slice_to_ffi ( const struct __go_slice_type *descriptor __attribute__ ((unused))) { ffi_type *ret; - ffi_type *intgo; + ffi_type *ffi_intgo; ret = (ffi_type *) __go_alloc (sizeof (ffi_type)); ret->type = FFI_TYPE_STRUCT; ret->elements = (ffi_type **) __go_alloc (4 * sizeof (ffi_type *)); ret->elements[0] = &ffi_type_pointer; - intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; - ret->elements[1] = intgo; - ret->elements[2] = intgo; + ffi_intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; + ret->elements[1] = ffi_intgo; + ret->elements[2] = ffi_intgo; ret->elements[3] = NULL; return ret; } @@ -117,14 +117,14 @@ static ffi_type * go_string_to_ffi (void) { ffi_type *ret; - ffi_type *intgo; + ffi_type *ffi_intgo; ret = (ffi_type *) __go_alloc (sizeof (ffi_type)); ret->type = FFI_TYPE_STRUCT; ret->elements = (ffi_type **) __go_alloc (3 * sizeof (ffi_type *)); ret->elements[0] = &ffi_type_pointer; - intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; - ret->elements[1] = intgo; + ffi_intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; + ret->elements[1] = ffi_intgo; ret->elements[2] = NULL; return ret; } -- 2.34.1