[cells-gtk-cvs] CVS root/gtk-ffi

[pdenno]

Update of /project/cells-gtk/cvsroot/root/gtk-ffi
In directory clnet:/tmp/cvs-serv5638/root/gtk-ffi

Modified Files:
	gtk-ffi.lisp 
Log Message:
Applied patches from Andras Simon

--- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.lisp	2006/06/01 14:16:28	1.20
+++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.lisp	2006/06/07 17:00:25	1.21
@@ -16,11 +16,6 @@
  
 |#
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (unless (find-package :gtk-ffi)
-      (defpackage :gtk-ffi
-	(:use :common-lisp :pod))))
-
 (in-package :gtk-ffi)
 
 ;;; POD throw-away utility to convert hello-c/uffi to cffi
@@ -50,8 +45,12 @@
 		      funcs))
 	     *standard-output*))))
 
+;;keep SBCL happy
+(defconstant +c-null+ 
+  (if (boundp '+c-null+)
+      (symbol-value '+c-null+)
+    (cffi:null-pointer)))
 
-(defconstant +c-null+ (cffi:null-pointer)) 
 (defvar *gtk-debug* nil)
 
 ;;; ==============  Define CFFI types, and their translations.... 
@@ -136,13 +135,13 @@
 				 #+win32 "libgtk-win32-2.0-0.dll" 
 				 #+macosx "libgtk-win32-2.0-0.dylib")
       #+libcellsgtk
-      (cffi:load-foreign-library #+cffi-features:unix "libcellsgtk.so" 
+      (cffi:load-foreign-library #+cffi-features:unix 
+				 (merge-pathnames "libcellsgtk.so" #.*compile-file-pathname*)
 				 #+win32 "libcellsgtk.dll" 
 				 #+macosx "libcellsgtk.dylib")))
 ) ; eval
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(+c-null+ int-slot-indexed load-gtk-libs))
   (defun gtk-function-name (lisp-name)
     (substitute #\_ #\- lisp-name))
 
@@ -425,9 +424,5 @@
 (defun cast (ptr type)
   (deref-pointer-runtime-typed ptr (ffi-to-uffi-type type)))
 
-(eval-when (compile load eval)
-  (export '(uint c-pointer c-ptr-null c-array-ptr c-ptr c-string sint32 uint32 uint8 boolean
-	    ulong int long single-float double-float otherwise *gtk-debug* load-gtk-libs
-	    col-type-to-ffi-type deref-pointer-runtime-typed gtk-tree-iter +c-null+)))