From: Kevin M. Rosenberg Date: Wed, 13 Aug 2003 18:53:42 +0000 (+0000) Subject: r5493: *** empty log message *** X-Git-Tag: v1.6.1~196 X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=65e2a75247b894d1f562102ef1df77c7060b5048;hp=5adb58ea9a2b4f0af8789ce6ac722253e1aa6153;p=uffi.git r5493: *** empty log message *** --- diff --git a/debian/changelog b/debian/changelog index 5239091..128e210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.2.22-1) unstable; urgency=low + + * New upstream with Lispworks patch from Edi Weitz + + -- Kevin M. Rosenberg Tue, 12 Aug 2003 08:09:04 -0600 + cl-uffi (1.2.21-1) unstable; urgency=low * New upstream -- fix for Franz's mlisp diff --git a/src/aggregates.lisp b/src/aggregates.lisp index 6ee0ac7..ae86bbe 100644 --- a/src/aggregates.lisp +++ b/src/aggregates.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.lisp,v 1.7 2003/06/06 21:59:18 kevin Exp $ +;;;; $Id: aggregates.lisp,v 1.8 2003/08/13 18:53:42 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -80,7 +80,8 @@ of the enum-name name, separator-string, and field-name" #+(or cmu scl) `((* (alien:struct ,name))) #+sbcl `((* (sb-alien:struct ,name))) #+mcl `((:* (:struct ,name))) - #-(or cmu sbcl scl mcl) `((* ,name)) + #+lispworks `((:pointer ,name)) + #-(or cmu sbcl scl mcl lispworks) `((* ,name)) `(,(convert-from-uffi-type type :struct)))))) (if variant (push (list def) processed) diff --git a/tests/arrays.lisp b/tests/arrays.lisp index 17652ba..641996c 100644 --- a/tests/arrays.lisp +++ b/tests/arrays.lisp @@ -7,16 +7,13 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: arrays.lisp,v 1.4 2003/05/01 04:59:37 kevin Exp $ +;;;; $Id: arrays.lisp,v 1.5 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-constant +column-length+ 10) (uffi:def-constant +row-length+ 10) diff --git a/tests/atoifl.lisp b/tests/atoifl.lisp index 23bbda0..b5cc75b 100644 --- a/tests/atoifl.lisp +++ b/tests/atoifl.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: atoifl.cl +;;;; Name: atoifl.lisp ;;;; Purpose: UFFI Example file to atoi/atof/atol ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: atoifl.lisp,v 1.2 2003/04/29 12:57:10 kevin Exp $ +;;;; $Id: atoifl.lisp,v 1.3 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-function ("atoi" c-atoi) ((str :cstring)) diff --git a/tests/compress.lisp b/tests/compress.lisp index 3a68774..5bb6e3d 100644 --- a/tests/compress.lisp +++ b/tests/compress.lisp @@ -7,16 +7,13 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: compress.lisp,v 1.11 2003/05/02 02:50:12 kevin Exp $ +;;;; $Id: compress.lisp,v 1.12 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-function ("compress" c-compress) ((dest (* :unsigned-char)) diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp index eea4794..569b098 100644 --- a/tests/foreign-loader.lisp +++ b/tests/foreign-loader.lisp @@ -7,19 +7,16 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: foreign-loader.lisp,v 1.3 2003/06/26 18:02:08 kevin Exp $ +;;;; $Id: foreign-loader.lisp,v 1.4 2003/08/13 18:53:42 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* ;;; For CMUCL, it's necessary to load foreign files separate from their ;;; usage -(in-package :uffi-tests) +(in-package #:uffi-tests) (eval-when (:compile-toplevel :load-toplevel :execute) (unless (uffi:load-foreign-library diff --git a/tests/getenv.lisp b/tests/getenv.lisp index 0a64fc4..aba9b6e 100644 --- a/tests/getenv.lisp +++ b/tests/getenv.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: getenv.cl +;;;; Name: getenv.lisp ;;;; Purpose: UFFI Example file to get environment variable ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: getenv.lisp,v 1.3 2003/05/01 23:31:40 kevin Exp $ +;;;; $Id: getenv.lisp,v 1.4 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-function ("getenv" c-getenv) diff --git a/tests/gethostname.lisp b/tests/gethostname.lisp index 6b8e482..d05e2ea 100644 --- a/tests/gethostname.lisp +++ b/tests/gethostname.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: gethostname.cl +;;;; Name: gethostname.lisp ;;;; Purpose: UFFI Example file to get hostname of system ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: gethostname.lisp,v 1.5 2003/04/29 14:13:55 kevin Exp $ +;;;; $Id: gethostname.lisp,v 1.6 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) ;;; This example is inspired by the example on the CL-Cookbook web site diff --git a/tests/strtol.lisp b/tests/strtol.lisp index 1cb1be9..0167dbf 100644 --- a/tests/strtol.lisp +++ b/tests/strtol.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: strtol.cl +;;;; Name: strtol.lisp ;;;; Purpose: UFFI Example file to strtol, uses pointer arithmetic ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strtol.lisp,v 1.2 2003/04/29 12:57:10 kevin Exp $ +;;;; $Id: strtol.lisp,v 1.3 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-foreign-type char-ptr (* :unsigned-char)) diff --git a/tests/structs.lisp b/tests/structs.lisp new file mode 100644 index 0000000..1522a15 --- /dev/null +++ b/tests/structs.lisp @@ -0,0 +1,34 @@ +;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: structs.lisp +;;;; Purpose: UFFI Example file to strtol, uses pointer arithmetic +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Feb 2002 +;;;; +;;;; $Id: structs.lisp,v 1.1 2003/08/13 18:53:42 kevin Exp $ +;;;; +;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; +;;;; ************************************************************************* + +(in-package #:uffi-tests) + +;; Compilation failure as reported by Edi Weitz + + +(uffi:def-struct foo + (bar :pointer-self)) + +(uffi:def-foreign-type foo-ptr (* foo)) + +(uffi:def-function "baz" + ((x :int)) + :returning foo-ptr + :module "frob") + +(defun test () + (with-foreign-object (p 'foo) + (baz p))) + diff --git a/tests/time.lisp b/tests/time.lisp index 0dd1816..2402b42 100644 --- a/tests/time.lisp +++ b/tests/time.lisp @@ -7,16 +7,13 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: time.lisp,v 1.1 2003/04/30 14:06:14 kevin Exp $ +;;;; $Id: time.lisp,v 1.2 2003/08/13 18:53:42 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-foreign-type time-t :unsigned-long) diff --git a/tests/uffi-c-test-lib.lisp b/tests/uffi-c-test-lib.lisp index eb07ef6..928b073 100644 --- a/tests/uffi-c-test-lib.lisp +++ b/tests/uffi-c-test-lib.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: c-test-fns.cl +;;;; Name: uffi-c-test-lib.lisp ;;;; Purpose: UFFI Example file for zlib compression ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: uffi-c-test-lib.lisp,v 1.2 2003/05/02 02:50:12 kevin Exp $ +;;;; $Id: uffi-c-test-lib.lisp,v 1.3 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-function ("cs_to_upper" cs-to-upper) diff --git a/tests/union.lisp b/tests/union.lisp index aefbaaf..7c4dc33 100644 --- a/tests/union.lisp +++ b/tests/union.lisp @@ -2,21 +2,18 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: union.cl +;;;; Name: union.lisp ;;;; Purpose: UFFI Example file to test unions ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: union.lisp,v 1.4 2003/04/29 14:08:02 kevin Exp $ +;;;; $Id: union.lisp,v 1.5 2003/08/13 18:53:42 kevin Exp $ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :uffi-tests) +(in-package #:uffi-tests) (uffi:def-union tunion1 (char :char) diff --git a/uffi-tests.asd b/uffi-tests.asd index c0b8491..6845a74 100644 --- a/uffi-tests.asd +++ b/uffi-tests.asd @@ -7,7 +7,7 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Apr 2003 ;;;; -;;;; $Id: uffi-tests.asd,v 1.7 2003/05/02 02:50:12 kevin Exp $ +;;;; $Id: uffi-tests.asd,v 1.8 2003/08/13 18:53:42 kevin Exp $ ;;;; ************************************************************************* (defpackage #:uffi-tests-system @@ -27,6 +27,7 @@ (:file "gethostname" :depends-on ("package")) (:file "union" :depends-on ("package")) (:file "arrays" :depends-on ("package")) + (:file "structs" :depends-on ("package")) (:file "time" :depends-on ("package")) (:file "foreign-loader" :depends-on ("package")) (:file "compress" :depends-on ("foreign-loader"))