X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.cl;h=7a57a949aa4c5d7352fd01f472b92977a4f8a354;hb=821574a8fa654cba82147a9d30a02a13e495f6db;hp=009c1fcf8b974ebbf37b025edea42041154dc764;hpb=21d0b1a60cd138b710bb1df8c1a9d01ef49ff036;p=uffi.git

diff --git a/src/primitives.cl b/src/primitives.cl
index 009c1fc..7a57a94 100644
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.17 2002/04/28 06:03:13 kevin Exp $
+;;;; $Id: primitives.cl,v 1.20 2002/06/27 14:35:24 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -56,7 +56,8 @@ supports takes advantage of this optimization."
 (defconstant +cmu-def-type-list+
     '((:char . (alien:signed 8))
       (:unsigned-char . (alien:unsigned 8))
-      (:byte . (alien:unsigned 8))
+      (:byte . (alien:signed 8))
+      (:unsigned-byte . (alien:unsigned 8))
       (:short . (alien:signed 16))
       (:unsigned-short . (alien:unsigned 16))
       (:int . (alien:signed 32))
@@ -78,7 +79,8 @@ supports takes advantage of this optimization."
       (:cstring . c-call:c-string)
       (:char . c-call:char) 
       (:unsigned-char . (alien:unsigned 8))
-      (:byte . (alien:unsigned 8))
+      (:byte . (alien:signed 8))
+      (:unsigned-byte . (alien:unsigned 8))
       (:short . c-call:unsigned-short) 
       (:unsigned-short . c-call:unsigned-short)
       (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
@@ -91,9 +93,10 @@ supports takes advantage of this optimization."
       (:short . :short)
       (:pointer-void . (* :void))
       (:cstring . (* :unsigned-char))
+      (:byte . :char)
+      (:unsigned-byte . :unsigned-byte)
       (:char . :char)
       (:unsigned-char . :unsigned-char)
-      (:byte . :byte)
       (:int . :int) (:unsigned-int . :unsigned-int) 
       (:long . :long) (:unsigned-long . :unsigned-long)
       (:float . :float) (:double . :double)
@@ -103,10 +106,12 @@ supports takes advantage of this optimization."
     '((* . :pointer) (:void . :void) 
       (:short . :short)
       (:pointer-void . (:pointer :void))
-      (:cstring . (:reference-pass :ef-mb-string :allow-null t))
-      (:cstring-returning . (:reference :ef-mb-string :allow-null t))
+      (:cstring . (:reference-pass (:ef-mb-string :external-format :latin-1)
+				   :allow-null t))
+      (:cstring-returning . (:reference (:ef-mb-string :external-format :latin-1) :allow-null t))
+      (:byte . :byte)
+      (:unsigned-byte . (:unsigned :byte))
       (:char . :char)
-      (:byte :byte)
       (:unsigned-char . (:unsigned :char))
       (:int . :int) (:unsigned-int . (:unsigned :int))
       (:long . :long) (:unsigned-long . (:unsigned :long))