From 86090e25990cfa176e2ae54c57f2c754950cbfa1 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 11 Jul 2008 08:23:52 +0000 Subject: [PATCH] fix compile failures resulting from last few commits --- archival/libunarchive/get_header_tar.c | 3 +-- include/unarchive.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index cf35d41a0..e9c730d65 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c @@ -108,8 +108,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) bb_error_msg_and_die("short read"); } if (i != 512) { - if (ENABLE_FEATURE_TAR_AUTODETECT) - goto autodetect; + USE_FEATURE_TAR_AUTODETECT(goto autodetect;) goto short_read; } diff --git a/include/unarchive.h b/include/unarchive.h index 5b71d3e62..17a46b6d7 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -132,7 +132,7 @@ extern void open_transformer(int fd, USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd)) FAST_FUNC; #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transformer) #else -extern int open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; +extern void open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transform_prog) #endif