--- a/src/input-method-xlib.c	Sun Nov 02 00:34:13 2008 +0900
+++ b/src/input-method-xlib.c	Mon Dec 22 12:05:47 2008 +0000
@@ -286,19 +286,19 @@
   xic_vars_t xic_vars;
   XIC xic;
 
-#define res(name, class_, representation, field, default_value) \
-  { name, class_, representation, sizeof(xic_vars.field), \
-     XtOffsetOf(xic_vars_t, field), XtRString, default_value }
+#define res(name, class_, representation, field, default_value) 	\
+  Xt_RESOURCE (name, class_, representation, xic_vars.field,		\
+	       XtOffsetOf(xic_vars_t, field), XtRString, default_value)
 
   static XtResource resources[] =
   {
     /*  name              class          represent'n   field    default value */
-    res(XtNximStyles,     XtCXimStyles,  XtRXimStyles, styles,  (XtPointer) DefaultXIMStyles),
-    res(XtNfontSet,       XtCFontSet,    XtRFontSet,   fontset, (XtPointer) XtDefaultFontSet),
-    res(XtNximForeground, XtCForeground, XtRPixel,     fg,      (XtPointer) XtDefaultForeground),
-    res(XtNximBackground, XtCBackground, XtRPixel,     bg,      (XtPointer) XtDefaultBackground)
+    res(XtNximStyles,     XtCXimStyles,  XtRXimStyles, styles,  DefaultXIMStyles),
+    res(XtNfontSet,       XtCFontSet,    XtRFontSet,   fontset, XtDefaultFontSet),
+    res(XtNximForeground, XtCForeground, XtRPixel,     fg,      XtDefaultForeground),
+    res(XtNximBackground, XtCBackground, XtRPixel,     bg,      XtDefaultBackground)
   };
-
+#undef res
 
   xim = DEVICE_X_XIM (d);
 
@@ -977,7 +977,7 @@
 }
 
 void
-describe_XRectangle (char *name, XRectangle *r)
+describe_XRectangle (const char *name, XRectangle *r)
 {
   if (r == NULL)
     stderr_out ("%s: NULL\n", name);