diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /archival/tar.c | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'archival/tar.c')
| -rw-r--r-- | archival/tar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/tar.c b/archival/tar.c index e7963b0b4..2b752f640 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | #include <fnmatch.h> | 45 | #include <fnmatch.h> |
| 46 | #include "libbb.h" | 46 | #include "libbb.h" |
| 47 | #include "archive.h" | 47 | #include "bb_archive.h" |
| 48 | /* FIXME: Stop using this non-standard feature */ | 48 | /* FIXME: Stop using this non-standard feature */ |
| 49 | #ifndef FNM_LEADING_DIR | 49 | #ifndef FNM_LEADING_DIR |
| 50 | # define FNM_LEADING_DIR 0 | 50 | # define FNM_LEADING_DIR 0 |