X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.cl;h=c61f6dd21680d7dc67ed3a25539726c47662af2d;hb=fb5b09939b3ee025b92dda2cbbe55ae73eeb4378;hp=0b5f05585ea30191d0897602e5eb1103fb64bfa5;hpb=f860fa69768ba86084196b9e482d497d7ef60901;p=uffi.git

diff --git a/src/primitives.cl b/src/primitives.cl
index 0b5f055..c61f6dd 100644
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.12 2002/03/21 11:38:07 kevin Exp $
+;;;; $Id: primitives.cl,v 1.16 2002/04/06 19:53:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,8 @@
   "Macro to define a constant and to export it"
   `(eval-when (:compile-toplevel :load-toplevel :execute)
      (defconstant ,name ,value)
-     ,(if export (list 'export `(quote ,name)) (values))))
+     ,(when export (list 'export `(quote ,name)))
+    ',name))
 
 (defmacro def-type (name type)
   "Generates a (deftype) statement for CL. Currently, only CMUCL
@@ -100,7 +101,7 @@ supports takes advantage of this optimization."
 (defconstant +type-conversion-list+
     '((* . :pointer) (:void . :void) 
       (:short . :short)
-      (:pointer-void . (:pointer :unsigned :void))
+      (:pointer-void . (:pointer :void))
       (:cstring . (:reference-pass :ef-mb-string :allow-null t))
       (:cstring-returning . (:reference :ef-mb-string :allow-null t))
       (:char . :char)