diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-10 14:38:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-10 14:38:22 +0000 |
| commit | a4cf75a393b0557ed78171ec6c626ccfc7b69158 (patch) | |
| tree | b6309745a2f8a9a411624c0d9a6f25b60c0c53e4 | |
| parent | 4004e87b9bcd3b354524babeed0d65f2c626da93 (diff) | |
| download | pkgsrc-a4cf75a393b0557ed78171ec6c626ccfc7b69158.tar.gz | |
Fix spelling of noreturn to match what any newer GCC compatible compiler
supports.
| -rw-r--r-- | net/tcpdmerge/distinfo | 4 | ||||
| -rw-r--r-- | net/tcpdmerge/patches/patch-aa | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/net/tcpdmerge/distinfo b/net/tcpdmerge/distinfo index 18ea645c63d..60b0d01cd7d 100644 --- a/net/tcpdmerge/distinfo +++ b/net/tcpdmerge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2011/12/07 15:17:29 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/09/10 14:38:22 joerg Exp $ SHA1 (tcpdmerge.c) = 6cf440a4f4802c28ab1cdbc71a6b1845efe062d6 RMD160 (tcpdmerge.c) = 27c46ae47f4b3a80bdbb7eb098ae0d96a3ac02d8 @@ -6,4 +6,4 @@ Size (tcpdmerge.c) = 9944 bytes SHA1 (00README.TXT) = ee508be0ffc9004c3ef42d98cc3ce394081634be RMD160 (00README.TXT) = 8d7042c50beb9261acc33edfdb3f28d6886e8f76 Size (00README.TXT) = 3388 bytes -SHA1 (patch-aa) = 950e5227504d8fa7d3298641c44ef76f691dd78a +SHA1 (patch-aa) = e1f77ba6308e58851aa1b7d7b1a2b9d41e82076c diff --git a/net/tcpdmerge/patches/patch-aa b/net/tcpdmerge/patches/patch-aa index 20bfa7fa40e..004853fe49b 100644 --- a/net/tcpdmerge/patches/patch-aa +++ b/net/tcpdmerge/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2011/12/07 15:17:30 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2013/09/10 14:38:22 joerg Exp $ ---- tcpdmerge.c.orig 2011-12-07 13:44:48.000000000 +0000 +--- tcpdmerge.c.orig 2013-09-10 11:20:39.000000000 +0000 +++ tcpdmerge.c @@ -45,7 +45,8 @@ #include <stdlib.h> @@ -12,3 +12,12 @@ $NetBSD: patch-aa,v 1.2 2011/12/07 15:17:30 joerg Exp $ #ifdef __STDC__ #include <stdarg.h> #else +@@ -60,7 +61,7 @@ char version[] = "1.0"; + char *program_name; + + void error(const char *fmt, ...); +-void usage(void)__attribute__((volatile)); ++void usage(void)__attribute__((__noreturn__)); + void merge_files(char file1_file_name[], char file2_file_name[], + char write_file_name[]); + void make_tmp_file( char filename[], pcap_t **pcap, |