| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [licensing] |
| 2 | |
| 3 | # Fix errors when built with gcc 4.3 |
| 4 | # Patch taken from Debian bug #452096 |
| 5 | |
| 6 | diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h |
| 7 | --- tar-1.17.orig/lib/argp-fmtstream.h 2006-01-11 12:24:05.000000000 -0800 |
| 8 | +++ tar-1.17/lib/argp-fmtstream.h 2010-07-22 22:36:12.000000000 -0700 |
| 9 | @@ -198,7 +198,11 @@ |
| 10 | #endif |
| 11 | |
| 12 | #ifndef ARGP_FS_EI |
| 13 | -#define ARGP_FS_EI extern inline |
| 14 | + #if defined __GNUC_STDC_INLINE__ |
| 15 | + #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) |
| 16 | + #else |
| 17 | + #define ARGP_FS_EI extern inline |
| 18 | + #endif |
| 19 | #endif |
| 20 | |
| 21 | ARGP_FS_EI size_t |
| 22 | diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h |
| 23 | --- tar-1.17.orig/lib/argp.h 2007-03-30 00:09:11.000000000 -0700 |
| 24 | +++ tar-1.17/lib/argp.h 2010-07-22 22:38:44.000000000 -0700 |
| 25 | @@ -580,7 +580,11 @@ |
| 26 | # endif |
| 27 | |
| 28 | # ifndef ARGP_EI |
| 29 | -# define ARGP_EI extern __inline__ |
| 30 | +# if defined __GNUC_STDC_INLINE__ |
| 31 | +# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) |
| 32 | +# else |
| 33 | +# define ARGP_EI extern __inline__ |
| 34 | +# endif |
| 35 | # endif |
| 36 | |
| 37 | ARGP_EI void |