From dbe56255ca42205ec9031a47f00245d5c1304fa4 Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@1ts.org>
Date: Tue, 21 Apr 2009 15:04:51 +0000
Subject: cleanup, pass -Wall -Werror

---
 zwgc/xmark.c | 3 +--
 zwgc/xshow.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'zwgc')

diff --git a/zwgc/xmark.c b/zwgc/xmark.c
index a8f5c26..d67c4f9 100644
--- a/zwgc/xmark.c
+++ b/zwgc/xmark.c
@@ -50,10 +50,9 @@ xmarkSetBound(x_gram *gram,
               int y,
               int which)
 {
-   int i,xofs,yofs;
+   int i, xofs, yofs;
    XFontSet font;
    xblock *xb;
-   unsigned char *s;
    int num_chars;
    XRectangle *ink, *logical;
 
diff --git a/zwgc/xshow.c b/zwgc/xshow.c
index 88226bd..026c954 100644
--- a/zwgc/xshow.c
+++ b/zwgc/xshow.c
@@ -374,7 +374,7 @@ no_dots_downcase_var(char *str)
    return(var2);
 }
 
-inline static XFontStruct *
+inline static XFontSet
 mode_to_font(Display *dpy, char *style, xmode *mode) {
     return get_font(dpy,
                     style,
@@ -523,7 +523,7 @@ xshow(Display *dpy, desctype *desc, int numstr, int numnl)
             i = ZTransliterate(desc->str, desc->len,
                                strcmp(notice_charset, "UNKNOWN") ?
                                 notice_charset : "ISO-8859-1",
-#ifdef X_HAVE_UTF8_STRING-
+#ifdef X_HAVE_UTF8_STRING
                                "UTF-8",
 #else
                                "UTF-16BE",
-- 
cgit v1.2.3