Date: Sun, 21 Jun 2015 06:49:45 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284669 - stable/10/sbin/growfs Message-ID: <201506210649.t5L6njum056635@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Sun Jun 21 06:49:44 2015 New Revision: 284669 URL: https://svnweb.freebsd.org/changeset/base/284669 Log: MFC r281929: Fix growfs(8) build with debug enabled (make -DGFSDBG). Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/growfs/Makefile stable/10/sbin/growfs/growfs.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/growfs/Makefile ============================================================================== --- stable/10/sbin/growfs/Makefile Sun Jun 21 06:44:32 2015 (r284668) +++ stable/10/sbin/growfs/Makefile Sun Jun 21 06:49:44 2015 (r284669) @@ -4,8 +4,6 @@ # $FreeBSD$ # -#GFSDBG= - .include <bsd.own.mk> .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} Modified: stable/10/sbin/growfs/growfs.c ============================================================================== --- stable/10/sbin/growfs/growfs.c Sun Jun 21 06:44:32 2015 (r284668) +++ stable/10/sbin/growfs/growfs.c Sun Jun 21 06:49:44 2015 (r284669) @@ -161,7 +161,7 @@ growfs(int fsi, int fso, unsigned int Nf #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 Nf #ifdef FS_DEBUG { struct csum *dbg_csp; - int dbg_csc; + u_int32_t dbg_csc; char dbg_line[80]; dbg_csp = fscs;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506210649.t5L6njum056635>