import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / src / glyphs-x.c

diff --git a/src/glyphs-x.c b/src/glyphs-x.c
index 2b6d350..af515d8 100644 (file)
--- a/src/glyphs-x.c
+++ b/src/glyphs-x.c
@@ -1670,7 +1670,8 @@ x_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 {
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
-  char *p, *bits, *bp;
+  char *bits, *bp;
+  const char *p;
   const char * volatile emsg = 0;
   const char * volatile dstring;
 
@@ -2547,8 +2548,6 @@ x_native_layout_instantiate (Lisp_Object image_instance, Lisp_Object instantiato
                             Lisp_Object pointer_fg, Lisp_Object pointer_bg,
                             int dest_mask, Lisp_Object domain)
 {
-  Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
-
   x_widget_instantiate (image_instance, instantiator, pointer_fg,
                        pointer_bg, dest_mask, domain, "layout", 0);
 }