| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Replace use of macros from sys/cdefs.h since cdefs.h is missing on musl |
| 2 | |
| 3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 4 | Upstream-Status: Inappropriate |
| 5 | |
| 6 | Index: fts/fts.h |
| 7 | =================================================================== |
| 8 | --- fts.orig/fts.h |
| 9 | +++ fts/fts.h |
| 10 | @@ -126,15 +126,21 @@ typedef struct _ftsent { |
| 11 | char fts_name[1]; /* file name */ |
| 12 | } FTSENT; |
| 13 | |
| 14 | -#include <sys/cdefs.h> |
| 15 | +#ifdef __cplusplus |
| 16 | +extern "C" { |
| 17 | +#endif |
| 18 | |
| 19 | -__BEGIN_DECLS |
| 20 | -FTSENT *fts_children __P((FTS *, int)); |
| 21 | -int fts_close __P((FTS *)); |
| 22 | -FTS *fts_open __P((char * const *, int, |
| 23 | - int (*)(const FTSENT **, const FTSENT **))); |
| 24 | -FTSENT *fts_read __P((FTS *)); |
| 25 | -int fts_set __P((FTS *, FTSENT *, int)); |
| 26 | -__END_DECLS |
| 27 | +#ifndef __P |
| 28 | +#define __P |
| 29 | +#endif |
| 30 | +FTSENT *fts_children (FTS *p, int opts); |
| 31 | +int fts_close (FTS *p); |
| 32 | +FTS *fts_open (char * const * path, int opts, |
| 33 | + int (*compfn)(const FTSENT **, const FTSENT **)); |
| 34 | +FTSENT *fts_read (FTS *p); |
| 35 | +int fts_set (FTS *p, FTSENT *f, int opts); |
| 36 | |
| 37 | +#ifdef __cplusplus |
| 38 | +} |
| 39 | +#endif |
| 40 | #endif /* !_FTS_H_ */ |
| 41 | Index: fts/fts.c |
| 42 | =================================================================== |
| 43 | --- fts.orig/fts.c |
| 44 | +++ fts/fts.c |
| 45 | @@ -50,15 +50,15 @@ static char sccsid[] = "@(#)fts.c 8.6 (B |
| 46 | #include <string.h> |
| 47 | #include <unistd.h> |
| 48 | |
| 49 | -static FTSENT *fts_alloc __P((FTS *, char *, int)); |
| 50 | -static FTSENT *fts_build __P((FTS *, int)); |
| 51 | -static void fts_lfree __P((FTSENT *)); |
| 52 | -static void fts_load __P((FTS *, FTSENT *)); |
| 53 | -static size_t fts_maxarglen __P((char * const *)); |
| 54 | -static void fts_padjust __P((FTS *, void *)); |
| 55 | -static int fts_palloc __P((FTS *, size_t)); |
| 56 | -static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); |
| 57 | -static u_short fts_stat __P((FTS *, struct dirent *, FTSENT *, int)); |
| 58 | +static FTSENT *fts_alloc __P(FTS *, char *, int); |
| 59 | +static FTSENT *fts_build __P(FTS *, int); |
| 60 | +static void fts_lfree __P(FTSENT *); |
| 61 | +static void fts_load __P(FTS *, FTSENT *); |
| 62 | +static size_t fts_maxarglen __P(char * const *); |
| 63 | +static void fts_padjust __P(FTS *, void *); |
| 64 | +static int fts_palloc __P(FTS *, size_t); |
| 65 | +static FTSENT *fts_sort __P(FTS *, FTSENT *, int); |
| 66 | +static u_short fts_stat __P(FTS *, struct dirent *, FTSENT *, int); |
| 67 | |
| 68 | #define ISDOT(a) (a[0] == '.' && (!a[1] || a[1] == '.' && !a[2])) |
| 69 | |