X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/dba0c4467ec6412ea2666a2621ae496cc2ee7552..969d09e257a499b85dcdabdd884915d365fe42ed:/glib/glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 5ed1414..8817459 100644
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -15,13 +15,14 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: glib.lisp,v 1.10 2001-05-11 16:00:33 espen Exp $
+;; $Id: glib.lisp,v 1.13 2004-10-27 14:58:59 espen Exp $
 
 
 (in-package "GLIB")
 
 (use-prefix "g")
 
+;(load-shared-library "libglib-2.0")
 
 ;;;; Memory management
 
@@ -32,10 +33,10 @@
   (address pointer)
   (size unsigned-long))
 
-;(defbinding (deallocate-memory "g_free") () nil
-;  (address pointer))
-(defun deallocate-memory (address)
-  (declare (ignore address)))
+(defbinding (deallocate-memory "g_free") () nil
+  (address pointer))
+;(defun deallocate-memory (address)
+;  (declare (ignore address)))
 
 (defun copy-memory (from length &optional (to (allocate-memory length)))
   (kernel:system-area-copy from 0 to 0 (* 8 length))
@@ -327,7 +328,7 @@
 	 (dotimes (i ,length)
 	   (setf
 	    (aref vector i)
-	    ,(translate-to-alien
+	    ,(translate-from-alien
 	      element-type
 	      `(,(sap-ref-fname element-type) c-array (* i ,element-size))
 	      weak-ref)))
@@ -351,10 +352,10 @@
 		  `(dotimes (i ,length)
 		     (unreference-alien
 		      element-type (sap-ref-sap c-vector (* i ,element-size))))
-		`(do ((offset 0 (+ offset ,element-size))
+		`(do ((offset 0 (+ offset ,element-size)))
 		      ((sap=
 			(sap-ref-sap c-vector offset)
-			*magic-end-of-array*)))
+			*magic-end-of-array*))
 		     ,(unreference-alien
 		       element-type '(sap-ref-sap c-vector offset))))))
 	 (deallocate-memory c-vector)))))
@@ -379,4 +380,3 @@
 	   (elt sequence i)
 	   (funcall function (funcall reader location (* i size)))))
 	sequence)))))
-     
\ No newline at end of file