svn commit: trunk/busybox: archival/libunarchive include

vda at busybox.net vda at busybox.net
Fri Jul 11 08:23:53 UTC 2008


Author: vda
Date: 2008-07-11 01:23:52 -0700 (Fri, 11 Jul 2008)
New Revision: 22773

Log:
fix compile failures resulting from last few commits



Modified:
   trunk/busybox/archival/libunarchive/get_header_tar.c
   trunk/busybox/include/unarchive.h


Changeset:
Modified: trunk/busybox/archival/libunarchive/get_header_tar.c
===================================================================
--- trunk/busybox/archival/libunarchive/get_header_tar.c	2008-07-11 08:02:04 UTC (rev 22772)
+++ trunk/busybox/archival/libunarchive/get_header_tar.c	2008-07-11 08:23:52 UTC (rev 22773)
@@ -108,8 +108,7 @@
 		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;
 	}
 

Modified: trunk/busybox/include/unarchive.h
===================================================================
--- trunk/busybox/include/unarchive.h	2008-07-11 08:02:04 UTC (rev 22772)
+++ trunk/busybox/include/unarchive.h	2008-07-11 08:23:52 UTC (rev 22773)
@@ -132,7 +132,7 @@
 	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
 




More information about the busybox-cvs mailing list