Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/gzip XZ_SUPPORT requires maybe_errx().



details:   https://anonhg.NetBSD.org/src/rev/83345f58f636
branches:  trunk
changeset: 766218:83345f58f636
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jun 19 01:20:19 2011 +0000

description:
XZ_SUPPORT requires maybe_errx().

diffstat:

 usr.bin/gzip/gzip.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 05a1bfe3624c -r 83345f58f636 usr.bin/gzip/gzip.c
--- a/usr.bin/gzip/gzip.c       Sun Jun 19 00:55:09 2011 +0000
+++ b/usr.bin/gzip/gzip.c       Sun Jun 19 01:20:19 2011 +0000
@@ -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, ...)



Home | Main Index | Thread Index | Old Index