diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:32:22 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:32:22 +1000 |
| commit | 035857cb1c5ea2956b5bc721992169e2571fc03b (patch) | |
| tree | 0979c8c1cad4537232b6be352a4c8da6d96072fb /include/libbb.h | |
| parent | 29ab9e37d0dc05dc6e302437106800bf62748b05 (diff) | |
| parent | 8837c5dec402fd6782589c0a676bc7f90dea4061 (diff) | |
| download | busybox-w32-035857cb1c5ea2956b5bc721992169e2571fc03b.tar.gz busybox-w32-035857cb1c5ea2956b5bc721992169e2571fc03b.tar.bz2 busybox-w32-035857cb1c5ea2956b5bc721992169e2571fc03b.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'include/libbb.h')
| -rw-r--r-- | include/libbb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 58a5968c5..c9b3ffaa0 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -669,7 +669,7 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST | |||
| 669 | || ENABLE_FEATURE_SEAMLESS_BZ2 \ | 669 | || ENABLE_FEATURE_SEAMLESS_BZ2 \ |
| 670 | || ENABLE_FEATURE_SEAMLESS_GZ \ | 670 | || ENABLE_FEATURE_SEAMLESS_GZ \ |
| 671 | /* || ENABLE_FEATURE_SEAMLESS_Z */ | 671 | /* || ENABLE_FEATURE_SEAMLESS_Z */ |
| 672 | extern int setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC; | 672 | extern void setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC; |
| 673 | #else | 673 | #else |
| 674 | # define setup_unzip_on_fd(...) ((void)0) | 674 | # define setup_unzip_on_fd(...) ((void)0) |
| 675 | #endif | 675 | #endif |