X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/6896c0f3344ff5cdf23bdd634a9413c782bdcbd7..0b77bad41d2bb901ab5d0f6e68c15b30e8be9e3b:/glib/ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 56fe1da..728b643 100644
--- a/glib/ffi.lisp
+++ b/glib/ffi.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: ffi.lisp,v 1.19 2005-04-17 21:49:19 espen Exp $
+;; $Id: ffi.lisp,v 1.22 2006-02-06 11:49:50 espen Exp $
 
 (in-package "GLIB")
 
@@ -184,7 +189,10 @@ (defun mkbinding (name return-type &rest arg-types)
 	  (%heap-alien
 	   (make-heap-alien-info
 	    :type (parse-alien-type ftype #+sbcl nil)
-	    :sap-form (foreign-symbol-address name))))
+	    :sap-form (let ((address (foreign-symbol-address name)))
+			(etypecase address
+			  (integer (int-sap address))
+			  (system-area-pointer address))))))
 	 (translate-arguments (mapcar #'to-alien-function arg-types))
 	 (translate-return-value (from-alien-function return-type))
 	 (cleanup-arguments (mapcar #'cleanup-function arg-types)))
@@ -263,6 +271,7 @@ (def-type-method copy-from-alien-function ())
 
 (def-type-method writer-function ())
 (def-type-method reader-function ())
+(def-type-method weak-reader-function ())
 (def-type-method destroy-function ())
 
 (def-type-method unbound-value ()
@@ -339,6 +348,9 @@ (defmethod copy-from-alien-form  (form (type t) &rest args)
 (defmethod copy-from-alien-function  ((type t) &rest args)
   (apply #'from-alien-function type args))
 
+(defmethod weak-reader-function ((type symbol) &rest args)
+  (apply #'reader-function type args))
+
 
 (defmethod alien-type ((type (eql 'signed-byte)) &rest args)
   (declare (ignore type))