From 39a388e426d1bb274c8a938381d6cf8829782ef6 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Mon, 8 Sep 2008 06:29:29 +0000
Subject: [PATCH] ABI constants are not preprocessor definitions; STDCALL only
 on Windows

svn: r11570
---
 src/foreign/foreign.c   | 8 ++------
 src/foreign/foreign.ssc | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/foreign/foreign.c b/src/foreign/foreign.c
index 66db104a04..bee89f4ad2 100644
--- a/src/foreign/foreign.c
+++ b/src/foreign/foreign.c
@@ -978,16 +978,12 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
   if (SCHEME_FALSEP(sym) || SAME_OBJ(sym, default_sym))
     return FFI_DEFAULT_ABI;
   else if (SAME_OBJ(sym, sysv_sym)) {
-#ifdef FFI_SYSV
     return FFI_SYSV;
-#else
-    scheme_signal_error("%s: ABI unimplemented: %V", who, sym);
-#endif
   } else if (SAME_OBJ(sym, stdcall_sym)) {
-#ifdef FFI_STDCALL
+#ifdef WINDOWS_DYNAMIC_LOAD
     return FFI_STDCALL;
 #else
-    scheme_signal_error("%s: ABI unimplemented: %V", who, sym);
+    scheme_signal_error("%s: ABI not implemented: %V", who, sym);
 #endif
   } else {
     scheme_signal_error("%s: unknown ABI: %V", who, sym);
diff --git a/src/foreign/foreign.ssc b/src/foreign/foreign.ssc
index 391387430e..07ac3ed0ba 100755
--- a/src/foreign/foreign.ssc
+++ b/src/foreign/foreign.ssc
@@ -830,16 +830,12 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
   if (SCHEME_FALSEP(sym) || SAME_OBJ(sym, default_sym))
     return FFI_DEFAULT_ABI;
   else if (SAME_OBJ(sym, sysv_sym)) {
-#ifdef FFI_SYSV
     return FFI_SYSV;
-#else
-    scheme_signal_error("%s: ABI unimplemented: %V", who, sym);
-#endif
   } else if (SAME_OBJ(sym, stdcall_sym)) {
-#ifdef FFI_STDCALL
+#ifdef WINDOWS_DYNAMIC_LOAD
     return FFI_STDCALL;
 #else
-    scheme_signal_error("%s: ABI unimplemented: %V", who, sym);
+    scheme_signal_error("%s: ABI not implemented: %V", who, sym);
 #endif
   } else {
     scheme_signal_error("%s: unknown ABI: %V", who, sym);