| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Define FNM_EXTMATCH if not defined its glibc specific define |
| 2 | include missing sys/stat.h for stat* function declarations |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 6 | |
| 7 | Index: squashfs-tools/action.c |
| 8 | =================================================================== |
| 9 | --- squashfs-tools.orig/action.c |
| 10 | +++ squashfs-tools/action.c |
| 11 | @@ -44,6 +44,10 @@ |
| 12 | #include "action.h" |
| 13 | #include "error.h" |
| 14 | |
| 15 | +#if !defined(FNM_EXTMATCH) |
| 16 | +#define FNM_EXTMATCH 0 |
| 17 | +#endif |
| 18 | + |
| 19 | /* |
| 20 | * code to parse actions |
| 21 | */ |
| 22 | Index: squashfs-tools/mksquashfs.c |
| 23 | =================================================================== |
| 24 | --- squashfs-tools.orig/mksquashfs.c |
| 25 | +++ squashfs-tools/mksquashfs.c |
| 26 | @@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st |
| 27 | dir_size + 3, directory_block, directory_offset, NULL, NULL, |
| 28 | dir, 0); |
| 29 | |
| 30 | +#if !defined(FNM_EXTMATCH) |
| 31 | +#define FNM_EXTMATCH 0 |
| 32 | +#endif |
| 33 | + |
| 34 | #ifdef SQUASHFS_TRACE |
| 35 | { |
| 36 | unsigned char *dirp; |
| 37 | Index: squashfs-tools/pseudo.c |
| 38 | =================================================================== |
| 39 | --- squashfs-tools.orig/pseudo.c |
| 40 | +++ squashfs-tools/pseudo.c |
| 41 | @@ -32,6 +32,7 @@ |
| 42 | #include <stdlib.h> |
| 43 | #include <sys/types.h> |
| 44 | #include <sys/wait.h> |
| 45 | +#include <sys/stat.h> |
| 46 | #include <ctype.h> |
| 47 | |
| 48 | #include "pseudo.h" |
| 49 | Index: squashfs-tools/unsquashfs.c |
| 50 | =================================================================== |
| 51 | --- squashfs-tools.orig/unsquashfs.c |
| 52 | +++ squashfs-tools/unsquashfs.c |
| 53 | @@ -38,6 +38,10 @@ |
| 54 | #include <limits.h> |
| 55 | #include <ctype.h> |
| 56 | |
| 57 | +#ifndef FNM_EXTMATCH |
| 58 | +#define FNM_EXTMATCH 0 |
| 59 | +#endif |
| 60 | + |
| 61 | struct cache *fragment_cache, *data_cache; |
| 62 | struct queue *to_reader, *to_inflate, *to_writer, *from_writer; |
| 63 | pthread_t *thread, *inflator_thread; |