CVS commit: src/usr.bin/m4

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Aug 14 12:59:25 UTC 2011

Modified Files:
        src/usr.bin/m4: Makefile main.c

Log Message:
kill gcc-4.5 warning


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/m4/Makefile
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/m4/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/m4/Makefile
diff -u src/usr.bin/m4/Makefile:1.16 src/usr.bin/m4/Makefile:1.17
--- src/usr.bin/m4/Makefile:1.16	Wed Jun 22 01:23:53 2011
+++ src/usr.bin/m4/Makefile	Sun Aug 14 08:59:25 2011
@@ -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

Index: src/usr.bin/m4/main.c
diff -u src/usr.bin/m4/main.c:1.39 src/usr.bin/m4/main.c:1.40
--- src/usr.bin/m4/main.c:1.39	Fri Nov  6 10:13:27 2009
+++ src/usr.bin/m4/main.c	Sun Aug 14 08:59:25 2011
@@ -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)