Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin/fsdb remove gcc-4.5 hacks.



details:   https://anonhg.NetBSD.org/src/rev/3544f53ece7d
branches:  trunk
changeset: 768311:3544f53ece7d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 14 12:30:04 2011 +0000

description:
remove gcc-4.5 hacks.

diffstat:

 sbin/fsdb/Makefile |  9 +++------
 sbin/fsdb/fsdb.c   |  7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r 1b46c02d0baa -r 3544f53ece7d sbin/fsdb/Makefile
--- a/sbin/fsdb/Makefile        Sun Aug 14 12:15:15 2011 +0000
+++ b/sbin/fsdb/Makefile        Sun Aug 14 12:30:04 2011 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.31 2011/07/03 15:29:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.32 2011/08/14 12:30:04 christos Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
-WARNS?=        3       # XXX: sign-compare issues in ../fsck_ffs
+WARNS?=        4
 
 .include <bsd.own.mk>
 
@@ -46,9 +46,6 @@
 .include <bsd.prog.mk>
 
 # XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45
-COPTS.fsdb.c+= -Wno-error
-.if ${MACHINE_ARCH} == "vax"
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${MACHINE_ARCH} == "vax"
 COPTS.fsdb.c+= -O0
 .endif
-.endif
diff -r 1b46c02d0baa -r 3544f53ece7d sbin/fsdb/fsdb.c
--- a/sbin/fsdb/fsdb.c  Sun Aug 14 12:15:15 2011 +0000
+++ b/sbin/fsdb/fsdb.c  Sun Aug 14 12:30:04 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $       */
+/*     $NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -280,8 +280,7 @@
                         * el_parse returns -1 to signal that it's not been
                         * handled internally.
                         */
-                       if (el_parse(elptr, cmd_argc,
-                                    (const char **)cmd_argv) != -1)
+                       if (el_parse(elptr, cmd_argc, (void *)cmd_argv) != -1)
                                continue;
                        known = 0;
                        for (cmdp = cmds; cmdp->cmd; cmdp++) {



Home | Main Index | Thread Index | Old Index