From 5c12b82b8d5f97145741e907c7e85155e084a223 Mon Sep 17 00:00:00 2001 From: trasz Date: Sun, 21 Jun 2015 06:49:44 +0000 Subject: [PATCH] MFC r281929: Fix growfs(8) build with debug enabled (make -DGFSDBG). Sponsored by: The FreeBSD Foundation --- sbin/growfs/Makefile | 6 +++--- sbin/growfs/growfs.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index 58ce41df6310..b4e109d5c41e 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -4,8 +4,6 @@ # $FreeBSD$ # -#GFSDBG= - .include .PATH: ${.CURDIR}/../mount @@ -16,7 +14,9 @@ MAN= growfs.8 CFLAGS+=-I${.CURDIR}/../mount .if defined(GFSDBG) -SRCS+= debug.c +SRCS+= debug.c +CFLAGS+= -DFS_DEBUG +NO_WCAST_ALIGN= yes .endif DPADD= ${LIBUTIL} diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index 96897e2f8db9..7b85b25329b8 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -161,7 +161,7 @@ growfs(int fsi, int fso, unsigned int Nflag) #ifdef FS_DEBUG { struct csum *dbg_csp; - int dbg_csc; + u_int32_t dbg_csc; char dbg_line[80]; dbg_csp = fscs; @@ -242,7 +242,7 @@ growfs(int fsi, int fso, unsigned int Nflag) #ifdef FS_DEBUG { struct csum *dbg_csp; - int dbg_csc; + u_int32_t dbg_csc; char dbg_line[80]; dbg_csp = fscs;