(g2-UU+5B73): Add `=decomposition@hanyo-denshi'.

[chise/xemacs-chise.git.1] / src / xmu.c

diff --git a/src/xmu.c b/src/xmu.c
index 943d24f..afe04be 100644 (file)
--- a/src/xmu.c
+++ b/src/xmu.c
@@ -53,10 +53,10 @@
 #include <ctype.h>
 
 
-int XmuCursorNameToIndex (CONST char *name)
+int XmuCursorNameToIndex (const char *name)
 {
-    static CONST struct _CursorName {
-       CONST char      *name;
+    static const struct _CursorName {
+       const char      *name;
        unsigned int    shape;
     } cursor_names[] = {
                        {"x_cursor",            XC_X_cursor},
@@ -137,7 +137,7 @@ int XmuCursorNameToIndex (CONST char *name)
                        {"watch",               XC_watch},
                        {"xterm",               XC_xterm},
     };
-    CONST struct _CursorName *table;
+    const struct _CursorName *table;
     int i;
     char tmp[40];
 
@@ -158,7 +158,7 @@ int XmuCursorNameToIndex (CONST char *name)
 
 
 /*
- * Based on an optimized version provided by Jim Becker, Auguest 5, 1988.
+ * Based on an optimized version provided by Jim Becker, August 5, 1988.
  */
 
 
@@ -368,7 +368,7 @@ int XmuReadBitmapData (
 }
 
 
-int XmuReadBitmapDataFromFile (CONST char *filename,
+int XmuReadBitmapDataFromFile (const char *filename,
                               /* Remaining args are RETURNED */
                               unsigned int *width,
                               unsigned int *height,
@@ -388,7 +388,7 @@ int XmuReadBitmapDataFromFile (CONST char *filename,
 
 /*
  * XmuPrintDefaultErrorMessage - print a nice error that looks like the usual
- * message.  Returns 1 if the caller should consider exitting else 0.
+ * message.  Return 1 if the caller should consider exiting, else 0.
  */
 int XmuPrintDefaultErrorMessage (Display *dpy, XErrorEvent *event, FILE *fp)
 {
@@ -530,7 +530,7 @@ int XmuSimpleErrorHandler (Display *dpy, XErrorEvent *errorp)
     return XmuPrintDefaultErrorMessage (dpy, errorp, stderr);
 }
 
-void XmuCopyISOLatin1Lowered(char *dst, CONST char *src)
+void XmuCopyISOLatin1Lowered(char *dst, const char *src)
 {
     unsigned char *dest   = (unsigned char *) dst;
     unsigned char *source = (unsigned char *) src;