Skip to content
Snippets Groups Projects
Commit 46930cc8 authored by ram's avatar ram
Browse files

Fixed ALLOCATE-RESOURCE-ID to not declare the types of the macro args,

but instead to include declarations in the expansion.
parent 5bfd87ac
No related branches found
No related tags found
No related merge requests found
...@@ -61,14 +61,12 @@ ...@@ -61,14 +61,12 @@
(defmacro allocate-resource-id (display object type) (defmacro allocate-resource-id (display object type)
;; Allocate a resource-id for OBJECT in DISPLAY ;; Allocate a resource-id for OBJECT in DISPLAY
(declare (type display display) `(the resource-id
(type t object)) ,(if (member (eval type) *clx-cached-types*)
(declare (values resource-id)) `(let ((id (funcall (display-xid ,display) ,display)))
(if (member (eval type) *clx-cached-types*) (save-id ,display id ,object)
`(let ((id (funcall (display-xid ,display) ,display))) id)
(save-id ,display id ,object) `(funcall (display-xid ,display) ,display))))
id)
`(funcall (display-xid ,display) ,display)))
(defmacro deallocate-resource-id (display id type) (defmacro deallocate-resource-id (display id type)
;; Deallocate a resource-id for OBJECT in DISPLAY ;; Deallocate a resource-id for OBJECT in DISPLAY
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment