Mercurial > hg > xemacs-beta
diff src/scrollbar-msw.c @ 5027:22179cd0fe15
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 10 Feb 2010 07:25:19 -0600 |
| parents | ae48681c47fa |
| children | 1fae11d56ad2 |
line wrap: on
line diff
--- a/src/scrollbar-msw.c Wed Feb 10 07:15:36 2010 -0600 +++ b/src/scrollbar-msw.c Wed Feb 10 07:25:19 2010 -0600 @@ -84,7 +84,7 @@ Fputhash (ptr, wrap_scrollbar_instance (sb), Vmswindows_scrollbar_instance_table); qxeSetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA, - (LONG) LISP_TO_VOID (ptr)); + (LONG) STORE_LISP_IN_VOID (ptr)); } static void @@ -96,7 +96,7 @@ (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA); Lisp_Object ptr; - ptr = VOID_TO_LISP (opaque); + ptr = GET_LISP_FROM_VOID (opaque); assert (OPAQUE_PTRP (ptr)); ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table); assert (!NILP (ptr)); @@ -223,7 +223,7 @@ else { Lisp_Object ptr; - ptr = VOID_TO_LISP (v); + ptr = GET_LISP_FROM_VOID (v); assert (OPAQUE_PTRP (ptr)); ptr = Fgethash (ptr, Vmswindows_scrollbar_instance_table, Qnil); sb = XSCROLLBAR_INSTANCE (ptr);