---
 demos/programs/ColorSel/util-c.c  |    4 ++++
 demos/programs/Ext18List/util-c.c |    4 ++++
 demos/programs/FontSel/fontsel.c  |    1 +
 demos/programs/IconB/misc.c       |    4 ++++
 demos/programs/Tree/bxutil-c.c    |    2 ++
 lib/Xm/XmString.c                 |    6 ++----
 tools/wml/wmlresolve.c            |    1 +
 7 files changed, 18 insertions(+), 4 deletions(-)

--- a/demos/programs/ColorSel/util-c.c
+++ b/demos/programs/ColorSel/util-c.c
@@ -3468,6 +3468,8 @@ GRA(xpmData *, mdata)
             c = xpmGetC(mdata);
         }
         return (c);
+    default:
+	abort();
     }
 }
 
@@ -3489,6 +3491,8 @@ GRA(xpmData *, mdata)
             /* if not natural XPM2 */
             mdata->InsideString = !mdata->InsideString;
         return (ungetc(c, mdata->stream.file));
+    default:
+	abort();
     }
 }
 
--- a/demos/programs/Ext18List/util-c.c
+++ b/demos/programs/Ext18List/util-c.c
@@ -3468,6 +3468,8 @@ GRA(xpmData *, mdata)
             c = xpmGetC(mdata);
         }
         return (c);
+    default:
+	abort();
     }
 }
 
@@ -3489,6 +3491,8 @@ GRA(xpmData *, mdata)
             /* if not natural XPM2 */
             mdata->InsideString = !mdata->InsideString;
         return (ungetc(c, mdata->stream.file));
+    default:
+	abort();
     }
 }
 
--- a/demos/programs/FontSel/fontsel.c
+++ b/demos/programs/FontSel/fontsel.c
@@ -121,5 +121,6 @@ char **argv;
     XtRealizeWidget(top);
 
     XtAppMainLoop(app);
+    return 0;
 }
 
--- a/demos/programs/IconB/misc.c
+++ b/demos/programs/IconB/misc.c
@@ -3440,6 +3440,8 @@ GRA(xpmData *, mdata)
             c = xpmGetC(mdata);
         }
         return (c);
+    default:
+	abort();
     }
 }
 
@@ -3461,6 +3463,8 @@ GRA(xpmData *, mdata)
             /* if not natural XPM2 */
             mdata->InsideString = !mdata->InsideString;
         return (ungetc(c, mdata->stream.file));
+    default:
+	abort();
     }
 }
 
--- a/demos/programs/Tree/bxutil-c.c
+++ b/demos/programs/Tree/bxutil-c.c
@@ -3469,6 +3469,7 @@ GRA(xpmData *, mdata)
         }
         return (c);
     }
+    abort();
 }
 
 
@@ -3490,6 +3491,7 @@ GRA(xpmData *, mdata)
             mdata->InsideString = !mdata->InsideString;
         return (ungetc(c, mdata->stream.file));
     }
+    abort();
 }
 
 /*
--- a/lib/Xm/XmString.c
+++ b/lib/Xm/XmString.c
@@ -7969,8 +7969,7 @@ XmStringParseText(XtPointer    text,
     case XmMULTIBYTE_TEXT:
       /* Non-NULL values (except _MOTIF_DEFAULT_LOCALE)
          are not accepted in Motif 2.0. */
-      if (tag != NULL && !(tag == _MOTIF_DEFAULT_LOCALE ||
-			   strcmp(tag, _MOTIF_DEFAULT_LOCALE) == 0))
+      if (tag != NULL && !(strcmp(tag, _MOTIF_DEFAULT_LOCALE) == 0))
       {
 	_XmProcessUnlock();
 	return NULL;
@@ -8583,8 +8582,7 @@ XmStringComponentCreate(XmStringComponen
 	_XmProcessUnlock();
 	return NULL;
       }
-      if ((value != _MOTIF_DEFAULT_LOCALE) &&
-	  (strcmp((char*) value, _MOTIF_DEFAULT_LOCALE) != 0)) {
+      if ((strcmp((char*) value, _MOTIF_DEFAULT_LOCALE) != 0)) {
 	_XmProcessUnlock();
 	return NULL;
       }
--- a/tools/wml/wmlresolve.c
+++ b/tools/wml/wmlresolve.c
@@ -69,6 +69,7 @@ static char rcsid[] = "$XConsortium: wml
 
 #if defined(__STDC__)
 #include <stdlib.h>
+#include <string.h>
 #endif
 #include <stdio.h>
 
