From 758ba5068c3017c44c23ebd71e8b15721fddea8d Mon Sep 17 00:00:00 2001
From: goffioul <goffioul>
Date: Mon, 17 Oct 2005 12:23:23 +0000
Subject: [PATCH] Fixes bugs in dynamic callbacks (MSVC).

---
 src/c/arch/ffi_x86.d | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/c/arch/ffi_x86.d b/src/c/arch/ffi_x86.d
index e5f94214e..f8364badc 100644
--- a/src/c/arch/ffi_x86.d
+++ b/src/c/arch/ffi_x86.d
@@ -120,7 +120,7 @@ ecl_dynamic_callback_execute(cl_object cbk_info, char *arg_buffer)
 		{
 			int mask = 3;
 			int sp = (size + mask) & ~mask;
-			arg_buffer += (size+sp);
+			arg_buffer += (sp);
 		}
 	}
 
@@ -153,18 +153,18 @@ INT:
 		{
 		register int eax asm("eax");
 		eax = i;
-		return;
 		}
 #endif
+		return;
 	case ECL_FFI_DOUBLE: {
 #ifdef _MSC_VER
 		__asm fld output.d
 #else
 		{
 		asm("fldl (%0)" :: "a" (&output.d));
-		return;
 		}
 #endif
+		return;
 	}
 	case ECL_FFI_FLOAT: {
 #ifdef _MSC_VER
@@ -172,7 +172,6 @@ INT:
 #else
 		{
 		asm("flds (%0)" :: "a" (&output.f));
-		return;
 		}
 #endif
 		return;