chiark
/
gitweb
/
~mdw
/
clg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d2b3ca
)
Type for callback ids changes to POINTER-DATA
author
espen
<espen>
Mon, 19 Feb 2007 13:46:44 +0000
(13:46 +0000)
committer
espen
<espen>
Mon, 19 Feb 2007 13:46:44 +0000
(13:46 +0000)
glib/gcallback.lisp
patch
|
blob
|
blame
|
history
diff --git
a/glib/gcallback.lisp
b/glib/gcallback.lisp
index 22d91a1d240c856aa429fadf5f988e7536915bf0..0aa8f88d349b11638f51618be2123499a1f3a8bf 100644
(file)
--- a/
glib/gcallback.lisp
+++ b/
glib/gcallback.lisp
@@
-20,7
+20,7
@@
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gcallback.lisp,v 1.
39 2007/01/07 20:03:51
espen Exp $
+;; $Id: gcallback.lisp,v 1.
40 2007/02/19 13:46:44
espen Exp $
(in-package "GLIB")
(in-package "GLIB")
@@
-550,8
+550,8
@@
(defmacro define-callback-marshal (name return-type args &key (callback-id :last
(t (second arg))))))
`(define-callback ,name ,return-type
,(ecase callback-id
(t (second arg))))))
`(define-callback ,name ,return-type
,(ecase callback-id
- (:first `((callback-id
unsigned-int
) ,@(mapcar #'list names types)))
- (:last `(,@(mapcar #'list names types) (callback-id
unsigned-int
))))
+ (:first `((callback-id
pointer-data
) ,@(mapcar #'list names types)))
+ (:last `(,@(mapcar #'list names types) (callback-id
pointer-data
))))
(declare (ignore ,@ignore))
(invoke-callback callback-id ',return-type ,@(nreverse params)))))
(declare (ignore ,@ignore))
(invoke-callback callback-id ',return-type ,@(nreverse params)))))