Module Name: src
Committed By: tsutsui
Date: Sun Jun 19 01:20:19 UTC 2011
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
XZ_SUPPORT requires maybe_errx().
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.100 src/usr.bin/gzip/gzip.c:1.101
--- src/usr.bin/gzip/gzip.c:1.100 Sun Jun 19 00:43:54 2011
+++ src/usr.bin/gzip/gzip.c Sun Jun 19 01:20:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.100 2011/06/19 00:43:54 christos Exp $ */
+/* $NetBSD: gzip.c,v 1.101 2011/06/19 01:20:19 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.100 2011/06/19 00:43:54 christos Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.101 2011/06/19 01:20:19 tsutsui Exp $");
#endif /* not lint */
/*
@@ -184,7 +184,8 @@
static void maybe_err(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
-#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
+#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \
+ !defined(NO_XZ_SUPPORT)
static void maybe_errx(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
#endif
@@ -440,7 +441,8 @@
exit(2);
}
-#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
+#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \
+ !defined(NO_XZ_SUPPORT)
/* ... without an errno. */
void
maybe_errx(const char *fmt, ...)
