ABI constants are not preprocessor definitions; STDCALL only on Windows

svn: r11570
This commit is contained in:
Eli Barzilay 2008-09-08 06:29:29 +00:00
parent 4f24a1c0cd
commit 39a388e426
2 changed files with 4 additions and 12 deletions

View File

@ -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);

View File

@ -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);