diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2007-10-18 12:30:31 +0200 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2007-10-18 12:30:31 +0200 |
| commit | f97fad55542df30ece4e076ed31043124a0c67f8 (patch) | |
| tree | 9151216abf0412c0f132db24f8fce5a0dfcec3d3 | |
| parent | f28542b9b45f83250a6d01bc062b65244d166a1c (diff) | |
Improve CLISP compatibility.
darcs-hash:ed5c2f6e5f03f8adabfb89279d275a7ce88821c7
| -rw-r--r-- | Lisp/libobjcl.lisp | 7 | ||||
| -rw-r--r-- | objective-cl.asd | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Lisp/libobjcl.lisp b/Lisp/libobjcl.lisp index c15282d..6c8469a 100644 --- a/Lisp/libobjcl.lisp +++ b/Lisp/libobjcl.lisp @@ -92,10 +92,15 @@ (defcfun ("objcl_alignof_type" %objcl-alignof-type) :long (typespec :string)) -(defcfun objcl-get-nil :pointer) +(defcfun ("objcl_get_nil" %objcl-get-nil) :pointer) (defcfun objcl-get-yes :long) (defcfun objcl-get-no :long) +(defun objcl-get-nil () + ;; %OBJCL-GET-NIL can return NIL for CLISP, which CFFI refuses to + ;; accept as an argument to POINTER-EQ. This is weird. + (or (%objcl-get-nil) (make-pointer 0))) + (defun initialise-runtime () "Initialise the Objective C runtime. diff --git a/objective-cl.asd b/objective-cl.asd index 4d95124..f399aa9 100644 --- a/objective-cl.asd +++ b/objective-cl.asd @@ -93,7 +93,7 @@ (mapcan #'(lambda (x) (directory (merge-pathnames x source-dir))) '(#p"**/*.m" #p"**/*.h" #p"**/GNUmakefile.*" - #p"**/*.make")))) + #p"**/*.make" #p"**/GNUmakefile")))) (output-dir (merge-pathnames #p"../../" (directory-namestring (first (output-files o c)))))) |