diff --git a/src/c/ffi.d b/src/c/ffi.d index 44fe79db0..bc769cb71 100644 --- a/src/c/ffi.d +++ b/src/c/ffi.d @@ -407,5 +407,5 @@ OUTPUT: if (type_of(output) == t_foreign) @(return output) else - FEerror("FIND-FOREIGN-VAR: Could not load foreign variable ~S from modeul ~S (Error: ~S)", 3, var, module, output); + FEerror("FIND-FOREIGN-SYMBOL: Could not load foreign variable ~S from modeul ~S (Error: ~S)", 3, var, module, output); } diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index e49e047a1..20a289a5e 100644 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -1429,7 +1429,7 @@ cl_symbols[] = { #endif {SYS_ "ALLOCATE-FOREIGN-DATA", SI_ORDINARY, si_allocate_foreign_data, 2, OBJNULL}, -{SYS_ "FIND-FOREIGN-VAR", SI_ORDINARY, si_find_foreign_symbol, 4, OBJNULL}, +{SYS_ "FIND-FOREIGN-SYMBOL", SI_ORDINARY, si_find_foreign_symbol, 4, OBJNULL}, {SYS_ "FOREIGN-DATA", SI_ORDINARY, NULL, -1, OBJNULL}, {SYS_ "FOREIGN-DATA-ADDRESS", SI_ORDINARY, si_foreign_data_address, 1, OBJNULL}, {SYS_ "FOREIGN-DATA-POINTER", SI_ORDINARY, si_foreign_data_pointer, 4, OBJNULL}, diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h index 31df03738..882b932b8 100644 --- a/src/c/symbols_list2.h +++ b/src/c/symbols_list2.h @@ -1429,7 +1429,7 @@ cl_symbols[] = { #endif {SYS_ "ALLOCATE-FOREIGN-DATA","si_allocate_foreign_data"}, -{SYS_ "FIND-FOREIGN-VAR","si_find_foreign_symbol"}, +{SYS_ "FIND-FOREIGN-SYMBOL","si_find_foreign_symbol"}, {SYS_ "FOREIGN-DATA",NULL}, {SYS_ "FOREIGN-DATA-ADDRESS","si_foreign_data_address"}, {SYS_ "FOREIGN-DATA-POINTER","si_foreign_data_pointer"}, diff --git a/src/lsp/ffi.lsp b/src/lsp/ffi.lsp index 2ba8d410d..a918a3552 100644 --- a/src/lsp/ffi.lsp +++ b/src/lsp/ffi.lsp @@ -546,7 +546,7 @@ (and (consp ffi-type) (member (first ffi-type) '(* :array))))) (inline-form (cond (module - `(si::find-foreign-var ,c-name ,module ,type ,(size-of-foreign-type type))) + `(si::find-foreign-symbol ,c-name ,module ,type ,(size-of-foreign-type type))) (t `(c-inline () () :object ,(format nil "ecl_make_foreign_data(@~S, ~A, &~A)"