The "#ifdef UNUSED_BLOCK" in stat_flags.c wasn't so unused after

all -- it was used by the mtree source.  So, instead do an "#ifdef
MTREE", and define that one when building mtree.
This commit is contained in:
he 2006-12-14 17:54:19 +00:00
parent ffe3445041
commit 29ff6ed16a
2 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: stat_flags.c,v 1.20 2006/12/14 14:15:26 christos Exp $ */ /* $NetBSD: stat_flags.c,v 1.21 2006/12/14 17:54:19 he Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -40,7 +40,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)stat_flags.c 8.2 (Berkeley) 7/28/94"; static char sccsid[] = "@(#)stat_flags.c 8.2 (Berkeley) 7/28/94";
#else #else
__RCSID("$NetBSD: stat_flags.c,v 1.20 2006/12/14 14:15:26 christos Exp $"); __RCSID("$NetBSD: stat_flags.c,v 1.21 2006/12/14 17:54:19 he Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -114,7 +114,7 @@ flags_to_string(u_long flags, const char *def)
} \ } \
} }
#ifdef UNUSED_BLOCK #ifdef MTREE
/* /*
* string_to_flags -- * string_to_flags --
* Take string of arguments and return stat flags. Return 0 on * Take string of arguments and return stat flags. Return 0 on
@ -184,4 +184,4 @@ string_to_flags(char **stringp, u_long *setp, u_long *clrp)
return (0); return (0);
} }
#endif /* UNUSED_BLOCK */ #endif /* MTREE */

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.27 2005/04/09 13:13:32 dsl Exp $ # $NetBSD: Makefile,v 1.28 2006/12/14 17:54:19 he Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/27/95 # from: @(#)Makefile 8.2 (Berkeley) 4/27/95
.include <bsd.own.mk> .include <bsd.own.mk>
PROG= mtree PROG= mtree
#CPPFLAGS+=-DDEBUG #CPPFLAGS+=-DDEBUG
CPPFLAGS+= -DMTREE
MAN= mtree.8 MAN= mtree.8
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \ SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \
getid.c stat_flags.c pack_dev.c getid.c stat_flags.c pack_dev.c