diff options
| author | cperciva <cperciva@FreeBSD.org> | 2008-05-22 21:08:36 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2008-05-22 21:08:36 +0000 |
| commit | 59f7395e1e105b8ef9807efca2af71e5175f8a27 (patch) | |
| tree | 761358248070311c176d7217dfa562598e0c7bf4 /usr.bin/tar | |
| parent | d24c63335bf907e0120b7d9ffa3da0b69b94e81a (diff) | |
| download | FreeBSD-src-59f7395e1e105b8ef9807efca2af71e5175f8a27.zip FreeBSD-src-59f7395e1e105b8ef9807efca2af71e5175f8a27.tar.gz | |
Improve portability via s/struct siginfo/struct siginfo_data/. This was
running into a namespace collision on an avian operating system.
Diffstat (limited to 'usr.bin/tar')
| -rw-r--r-- | usr.bin/tar/bsdtar.h | 2 | ||||
| -rw-r--r-- | usr.bin/tar/siginfo.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h index 62be3cc..ee255088 100644 --- a/usr.bin/tar/bsdtar.h +++ b/usr.bin/tar/bsdtar.h @@ -96,7 +96,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 siginfo_data *siginfo; /* for siginfo.c */ }; void bsdtar_errc(struct bsdtar *, int _eval, int _code, diff --git a/usr.bin/tar/siginfo.c b/usr.bin/tar/siginfo.c index e55308b..f0269a1 100644 --- a/usr.bin/tar/siginfo.c +++ b/usr.bin/tar/siginfo.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); /* Is there a pending SIGINFO or SIGUSR1? */ static volatile sig_atomic_t siginfo_received = 0; -struct siginfo { +struct siginfo_data { /* 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 siginfo_data))) == NULL) bsdtar_errc(bsdtar, 1, errno, "malloc failed"); /* Set the strings to NULL so that free() is safe. */ |
