r5493: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 5239091a7f687bc941f48e5779f0f56aab8800b2..128e21070df1befbf71925a8ddd9d1ab7a7aa231 100644 (file)
--- 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 <kmr@debian.org>  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 6ee0ac79ca072cc87e1dc4850ef180674dc2ff72..ae86bbe2b4d83db4156eacf551a804616fe05be1 100644 (file)
--- 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 17652bac3022ad30da8afe2b9809de638fc902fc..641996ca4dddd2cc667dd9872a087dae6f99c0ea 100644 (file)
--- 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 23bbda0b101ecba2d189f57a71b08cfe65a21ee9..b5cc75b2c70490de52dba3ae0cb676c46cbd2f80 100644 (file)
--- 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 3a6877434d031a9a358297ba2126e2cc47060262..5bb6e3d05f7e5fc129d6472b3ce107d458ea853b 100644 (file)
--- a/tests/compress.lisp
+++ b/tests/compress.lisp
@@ -7,16 +7,13 @@
 ;;;; Author:        Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: compress.lisp,v 1.11 2003/05/02 02:50:12 kevin Exp $\r
+;;;; $Id: compress.lisp,v 1.12 2003/08/13 18:53:42 kevin Exp $\r
 ;;;;\r
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg\r
+;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg\r
 ;;;;\r
-;;;; UFFI users are granted the rights to distribute and use this software\r
-;;;; as governed by the terms of the Lisp Lesser GNU Public License\r
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.\r
 ;;;; *************************************************************************\r
 \r
-(in-package :uffi-tests)\r
+(in-package #:uffi-tests)\r
 \r
 (uffi:def-function ("compress" c-compress)\r
     ((dest (* :unsigned-char))\r

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index eea47945833bdec2517ce43ab170e69c089789bb..569b0989e15208275496702b097081023c545282 100644 (file)
--- 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 0a64fc4eccbe12b6f5e6afd65e1ae0476724fbdc..aba9b6ebf7c173e0031fae677e82bd865f10f3b3 100644 (file)
--- 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 6b8e482b35bfac65fce9cb284b7c3d1044a8813e..d05e2eaf30690c2dfaeb4770c655caadb469e3fb 100644 (file)
--- 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 1cb1be9e4763a7378fbe331222650a824f33d92f..0167dbf700bd823c00ab11e32ce7ed01c362b50d 100644 (file)
--- 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 (file)
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 0dd1816d22aa6881c6acfacaacec8b190ba20eab..2402b429987d54b82730145b0c146f6b625312bf 100644 (file)
--- 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 eb07ef613a511912c5e4ced0616d68c2f23a28bb..928b073ecabd948dc00b501424698c9126c5f064 100644 (file)
--- 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 aefbaaf581ea4e81e6717bf9639de6aa9ff951d9..7c4dc33d7ae5741d4f20292480715faa83b3e3bf 100644 (file)
--- 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 c0b84911d30d250b484a0f80dfc83b9f156fe81c..6845a74ab6569ee0ab4d9f1beb671a12f3b7ec67 100644 (file)
--- 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"))