--- fvwm/builtins.c +++ fvwm/builtins.c @@ -2884,7 +2884,7 @@ int ret; unsigned long argument, data1 = 0, data2 = 0; - if (action == NULL || action == "\0") + if (action == NULL || (strcmp(action,"\0") == 0)) { return; } --- libs/Flocale.c +++ libs/Flocale.c @@ -1080,7 +1080,7 @@ fftf = FftGetFont(dpy, fn, module); if (fftf == NULL) { - if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT) + if (fn != NULL && fn != (char *)FLOCALE_FFT_FALLBACK_FONT) { free(fn); } @@ -1095,7 +1095,7 @@ &flf->fftf, &flf->height, &flf->ascent, &flf->descent); FftGetFontWidths(flf, &flf->max_char_width); free(fftf); - if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_FFT_FALLBACK_FONT) { free(fn); } @@ -1124,7 +1124,7 @@ } else if (!(fn_fixed = FlocaleFixNameForFontSet(dpy, fn, module))) { - if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT) { free(fn); } @@ -1136,7 +1136,7 @@ { free(fn_fixed); } - if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT) { free(fn); } @@ -1185,7 +1185,7 @@ { free(fn_fixed); } - if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT) { free(fn); } @@ -1212,7 +1212,7 @@ fn = FLOCALE_FALLBACK_FONT; } font = XLoadQueryFont(dpy, fn); - if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT) { free(fn); fn = NULL; @@ -1224,7 +1224,7 @@ } if (font == NULL) { - if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT) { free(fn); } @@ -1248,7 +1248,7 @@ flf->max_char_width = font->max_bounds.width; if (flf->font->max_byte1 > 0) flf->flags.is_mb = True; - if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT) { free(fn); } @@ -1460,8 +1460,8 @@ { flf = FlocaleGetFontOrFontSet( dpy, fn, encoding, fontname, module); - if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT && - fn != FLOCALE_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT && + fn != (char *) FLOCALE_FALLBACK_FONT) { free(fn); fn = NULL; @@ -1471,8 +1471,8 @@ str = GetQuotedString(str, &fn, ";", NULL, NULL, NULL); } } - if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT && - fn != FLOCALE_FALLBACK_FONT) + if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT && + fn != (char *) FLOCALE_FALLBACK_FONT) { free(fn); }