From: Dmitry Kalyanov Date: Tue, 12 May 2009 12:57:04 +0000 (+0400) Subject: Changed function names in GLib binding, commented function-like macros (TODO: add... X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=acb6d7cbb16fdac8836248b56d12d2866e4a388d;p=cl-gtk2.git Changed function names in GLib binding, commented function-like macros (TODO: add real functions for g_mutex, g_cond) --- diff --git a/glib/glib.lisp b/glib/glib.lisp index 20263a1..6007616 100644 --- a/glib/glib.lisp +++ b/glib/glib.lisp @@ -377,38 +377,40 @@ (thread (:pointer g-thread)) (priority g-thread-priority)) -(defcfun (g-mutex-new "g_mutex_new" :library glib) (:pointer g-mutex)) +;;;; TODO: Commented g_mutex_*, g_cond* because they are not functions, but called through dispatch table -(defcfun (g-mutex-lock "g_mutex_lock" :library glib) :void - (mutex (:pointer g-mutex))) +;; (defcfun (g-mutex-new "g_mutex_new" :library glib) (:pointer g-mutex)) -(defcfun (g-mutex-try-lock "g_mutex_trylock" :library glib) :boolean - (mutex (:pointer g-mutex))) +;; (defcfun (g-mutex-lock "g_mutex_lock" :library glib) :void +;; (mutex (:pointer g-mutex))) -(defcfun (g-mutex-free "g_mutex_free" :library glib) :void - (mutex (:pointer g-mutex))) +;; (defcfun (g-mutex-try-lock "g_mutex_trylock" :library glib) :boolean +;; (mutex (:pointer g-mutex))) + +;; (defcfun (g-mutex-free "g_mutex_free" :library glib) :void +;; (mutex (:pointer g-mutex))) ;omitted: GStaticMutex, GStaticRWLock stuff -(defcfun (g-cond-new "g_cond_new" :library glib) (:pointer g-cond)) +;; (defcfun (g-cond-new "g_cond_new" :library glib) (:pointer g-cond)) -(defcfun (g-cond-signal "g_cond_signal" :library glib) :void - (cond (:pointer g-cond))) +;; (defcfun (g-cond-signal "g_cond_signal" :library glib) :void +;; (cond (:pointer g-cond))) -(defcfun (g-cond-broadcast "g_cond_broadcast" :library glib) :void - (cond (:pointer g-cond))) +;; (defcfun (g-cond-broadcast "g_cond_broadcast" :library glib) :void +;; (cond (:pointer g-cond))) -(defcfun (g-cond-wait "g_cond_wait" :library glib) :void - (cond (:pointer g-cond)) - (mutex (:pointer g-mutex))) +;; (defcfun (g-cond-wait "g_cond_wait" :library glib) :void +;; (cond (:pointer g-cond)) +;; (mutex (:pointer g-mutex))) -(defcfun (g-cond-timed-wait "g_cond_timed_wait" :library glib) :boolean - (cond (:pointer g-cond)) - (mutex (:pointer g-mutex)) - (abs-time (:pointer g-time-val))) +;; (defcfun (g-cond-timed-wait "g_cond_timed_wait" :library glib) :boolean +;; (cond (:pointer g-cond)) +;; (mutex (:pointer g-mutex)) +;; (abs-time (:pointer g-time-val))) -(defcfun (g-cond-free "g_cond_free" :library glib) :void - (cond (:pointer g-cond))) +;; (defcfun (g-cond-free "g_cond_free" :library glib) :void +;; (cond (:pointer g-cond))) ;omitted: GPrivate, GOnce stuff diff --git a/glib/gobject.gparams.lisp b/glib/gobject.gparams.lisp index 005be28..e99b452 100644 --- a/glib/gobject.gparams.lisp +++ b/glib/gobject.gparams.lisp @@ -284,7 +284,7 @@ (element-spec (:pointer g-param-spec)) (flags g-param-flags)) -(defcfun g-param-spec-g-type (:pointer g-param-spec-g-type) +(defcfun (g-param-spec-g-type "g_param_spec_gtype") (:pointer g-param-spec-g-type) (name :string) (nick :string) (blurb :string)