X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Ffunctions.lisp;h=01d62eab7c83546737aca36832ee6b30d278a3cf;hb=4a32753775929412552a87847b9b265c50f8d835;hp=e4a87de697234c0cce89b3903cb08c5c5e7ef7c4;hpb=72190043201239567658cfbae1c36bbd7233419b;p=uffi.git

diff --git a/src/functions.lisp b/src/functions.lisp
index e4a87de..01d62ea 100644
--- a/src/functions.lisp
+++ b/src/functions.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -146,7 +144,7 @@
         #+(or cmu scl sbcl)
         `(%def-function ,names ,args
           ,@(if returning (list :returning returning) (values)))
-        #+(and lispworks lispworks5)
+        #+(or lispworks5 lispworks6)
         (multiple-value-bind (name-pair fname lisp-name)
             (preprocess-names names)
           `(progn
@@ -161,7 +159,7 @@
                                       ((member (first arg) out :key #'first)
                                        t)))
                           args)))))
-        #+(and lispworks (not lispworks5))
+        #+(and lispworks (not lispworks5) (not lispworks 6))
         `(%def-function ,names ,(convert-lispworks-args args)
           ,@(if module (list :module module) (values))
           ,@(if returning (list :returning returning) (values)))
@@ -212,7 +210,7 @@
        ,@(if module (list :module module) (values))
        :result-type ,result-type
       :language :ansi-c
-       #+:win32 :calling-convention #+:win32 :cdecl)
+       #+:mswindows :calling-convention #+:mswindows :cdecl)
     #+digitool
     `(eval-when (:compile-toplevel :load-toplevel :execute)
        (ccl:define-entry-point (,lisp-name ,foreign-name)