XEmacs 21.4.3 "Academic Rigor".

[chise/xemacs-chise.git.1] / src / input-method-motif.c

diff --git a/src/input-method-motif.c b/src/input-method-motif.c
index a1cb446..a05e055 100644 (file)
--- a/src/input-method-motif.c
+++ b/src/input-method-motif.c
@@ -41,7 +41,7 @@ Initialize_Locale (void)
 {
   char *locale;
 
-  /* dverna - Nov. 98: ### DON'T DO THIS !!! The default XtLanguageProc
+  /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc
      routine calls setlocale(LC_ALL, lang) which fucks up our lower-level
      locale management, and especially the value of LC_NUMERIC. Anyway, since
      at this point, we don't know yet whether we're gonna need an X11 frame,
@@ -115,9 +115,10 @@ XIM_init_frame (struct frame *f)
      default face, rather than foreground and background resources, or
      that the user can use set-frame-parameters to set xic attributes */
 
-#define res(name, class, representation, field, default_value) \
-  { name, class, representation, sizeof(xim_resources.field), \
-     XtOffsetOf(xim_resources_t, field), XtRString, default_value }
+#define res(name, class, representation, field, default_value) \
+  { name, class, representation, sizeof(xim_resources.field),  \
+    XtOffsetOf(xim_resources_t, field),                                \
+    XtRString, (XtPointer) (default_value) }
 
   static XtResource resources[] =
   {
@@ -161,7 +162,7 @@ XIM_SetGeometry (struct frame *f)
 void
 XIM_SetSpotLocation (struct frame *f, int x, int y)
 {
-  /* ### FIX: Must make sure spot fits within Preedit Area */
+  /* #### FIX: Must make sure spot fits within Preedit Area */
   XPoint *spot = &(FRAME_X_XIC_SPOT (f));
   if (spot->x == (short) x &&
       spot->y == (short) y)