[src/trunk]: src/usr.bin/m4 kill gcc-4.5 warning

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71b93fdfd777
branches:  trunk
changeset: 768320:71b93fdfd777
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 14 12:59:25 2011 +0000

description:
kill gcc-4.5 warning

diffstat:

 usr.bin/m4/Makefile |  7 +------
 usr.bin/m4/main.c   |  6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 941fefa1da10 -r 71b93fdfd777 usr.bin/m4/Makefile
--- a/usr.bin/m4/Makefile       Sun Aug 14 12:58:15 2011 +0000
+++ b/usr.bin/m4/Makefile       Sun Aug 14 12:59:25 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2011/06/22 05:23:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.17 2011/08/14 12:59:25 christos Exp $
 #
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
@@ -25,8 +25,3 @@
 CLEANFILES+=parser.c parser.h tokenizer.o
 
 .include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.main.c+= -Wno-error
-.endif
diff -r 941fefa1da10 -r 71b93fdfd777 usr.bin/m4/main.c
--- a/usr.bin/m4/main.c Sun Aug 14 12:58:15 2011 +0000
+++ b/usr.bin/m4/main.c Sun Aug 14 12:59:25 2011 +0000
@@ -1,5 +1,5 @@
 /*     $OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $ */
-/*     $NetBSD: main.c,v 1.39 2009/11/06 15:13:27 joerg Exp $  */
+/*     $NetBSD: main.c,v 1.40 2011/08/14 12:59:25 christos Exp $       */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.39 2009/11/06 15:13:27 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.40 2011/08/14 12:59:25 christos Exp $");
 #include <assert.h>
 #include <signal.h>
 #include <err.h>
@@ -572,7 +572,7 @@
                return NULL;
        }
 
-       p = ohash_find(&macros, ohash_qlookupi(&macros, name, (const char **)&tp));
+       p = ohash_find(&macros, ohash_qlookupi(&macros, name, (void *)&tp));
        if (p == NULL)
                return NULL;
        if (macro_getdef(p) == NULL)