diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-26 02:10:59 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-26 02:10:59 +0000 |
| commit | f0dc480a4aa1532caef8f2793e94bf51154fddd1 (patch) | |
| tree | 0d51b15a9965485a8c08e336306dc22fcd9e5aec /src | |
| parent | a4858ca2cb47dcaa229683dda30d167f49b4c3a6 (diff) | |
| download | open-axiom-f0dc480a4aa1532caef8f2793e94bf51154fddd1.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/ast.boot | 2 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 623ef907..a3d6e2a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (AxiomCore) [CCL]: Import and export + FFI-related symbols. + +2011-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/compiler.boot (getFormModemaps): Tidy checking of "elt" and "setelt" modemaps. 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" |