From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Tue, 20 May 2008 23:12:37 +0000 (-0400)
Subject: siginfo exists already as union on NetBSD, rename struct to
X-Git-Tag: v2.6.0~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c93872f35cbcedecbd7816854a2e0443cd86002;p=thirdparty%2Flibarchive.git

siginfo exists already as union on NetBSD, rename struct to
bsdtar_siginfo.

SVN-Revision: 81
---

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index 840322caa..bc696e0f6 100644
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -97,7 +97,7 @@ struct bsdtar {
 	struct matching		*matching;	/* for matching.c */
 	struct security		*security;	/* for read.c */
 	struct name_cache	*uname_cache;	/* for write.c */
-	struct siginfo		*siginfo;	/* for siginfo.c */
+	struct bsdtar_siginfo	*siginfo;	/* for siginfo.c */
 	struct substitution	*substitution;	/* for subst.c */
 };
 
diff --git a/tar/siginfo.c b/tar/siginfo.c
index 5e459cbd4..b5fe3a66f 100644
--- a/tar/siginfo.c
+++ b/tar/siginfo.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.1 2008/05/18 06:24:47 cperciva
 /* Is there a pending SIGINFO or SIGUSR1? */
 static volatile sig_atomic_t siginfo_received = 0;
 
-struct siginfo {
+struct bsdtar_siginfo {
 	/* What sort of operation are we doing? */
 	char * oper;
 
@@ -72,7 +72,7 @@ siginfo_init(struct bsdtar *bsdtar)
 {
 
 	/* Allocate space for internal structure. */
-	if ((bsdtar->siginfo = malloc(sizeof(struct siginfo))) == NULL)
+	if ((bsdtar->siginfo = malloc(sizeof(struct bsdtar_siginfo))) == NULL)
 		bsdtar_errc(bsdtar, 1, errno, "malloc failed");
 
 	/* Set the strings to NULL so that free() is safe. */