From f0dc480a4aa1532caef8f2793e94bf51154fddd1 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 26 Oct 2011 02:10:59 +0000 Subject: Restore Clozure CL-based build. CCL's FFI interface changed at some point in time. * lisp/core.lisp.in (AxiomCore) [CCL]: Import and export FFI-related symbols. --- src/ChangeLog | 5 +++++ src/boot/ast.boot | 2 +- src/lisp/core.lisp.in | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 623ef907..a3d6e2a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Gabriel Dos Reis + + * lisp/core.lisp.in (AxiomCore) [CCL]: Import and export + FFI-related symbols. + 2011-10-25 Gabriel Dos Reis * interp/compiler.boot (getFormModemaps): Tidy checking of "elt" diff --git a/src/boot/ast.boot b/src/boot/ast.boot index aa1f06b9..327dfe30 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -1799,7 +1799,7 @@ genCLOZUREnativeTranslation(op,s,t,op') == -- If the foreign call returns a C-string, turn it into a Lisp string. -- Note that if the C-string was malloc-ed, this will leak storage. if t is "string" then - call := [bfColonColon("CCL","GET-CSTRING"), call] + call := [bfColonColon("CCL","%GET-CSTRING"), call] -- If we have array arguments from Boot, bind pointers to initial data. for arg in aryPairs repeat diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index a7f244d8..adcf7233 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -58,6 +58,13 @@ ;; Clozure CL sequesters most of its useful extensions, in particular ;; threads, in the CCL package. ;; #+:clozure (:use "CCL") + #+:clozure (:import-from "CCL" + external-call %get-cstring + with-pointer-to-ivector with-cstrs) + #+:clozure (:export "CCL" + external-call %get-cstring + with-pointer-to-ivector with-cstrs) + (:export "%Thing" "%Void" "%Boolean" -- cgit v1.2.3