summaryrefslogtreecommitdiff
path: root/libarchive/test/test_write_disk_perms.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@gmail.com>2008-09-01 10:38:22 -0400
committerTim Kientzle <kientzle@gmail.com>2008-09-01 10:38:22 -0400
commitf5eb945d50b1d12fafd336baed933be71afd247b (patch)
tree57a08fde6b7f1fc1b6f73240450513993b35f058 /libarchive/test/test_write_disk_perms.c
parentd2322d460982fd7a7fdae236128e90629fc362e2 (diff)
downloadlibarchive-f5eb945d50b1d12fafd336baed933be71afd247b.tar.gz
IFC
SVN-Revision: 193
Diffstat (limited to 'libarchive/test/test_write_disk_perms.c')
-rw-r--r--libarchive/test/test_write_disk_perms.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c
index 2e872a1e..a8af80ce 100644
--- a/libarchive/test/test_write_disk_perms.c
+++ b/libarchive/test/test_write_disk_perms.c
@@ -23,9 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_perms.c,v 1.9 2008/06/15 10:35:22 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_perms.c,v 1.10 2008/09/01 05:38:33 kientzle Exp $");
-#if ARCHIVE_VERSION_STAMP >= 1009000
+#if ARCHIVE_VERSION_NUMBER >= 1009000
#define UMASK 022
@@ -125,7 +125,7 @@ defaultgid(void)
DEFINE_TEST(test_write_disk_perms)
{
-#if ARCHIVE_VERSION_STAMP < 1009000
+#if ARCHIVE_VERSION_NUMBER < 1009000
skipping("archive_write_disk interface");
#else
struct archive *a;
@@ -363,10 +363,10 @@ DEFINE_TEST(test_write_disk_perms)
assertEqualIntA(a,ARCHIVE_WARN,archive_write_finish_entry(a));
}
-#if ARCHIVE_API_VERSION > 1
- assert(0 == archive_write_finish(a));
-#else
+#if ARCHIVE_VERSION_NUMBER < 2000000
archive_write_finish(a);
+#else
+ assert(0 == archive_write_finish(a));
#endif
archive_entry_free(ae);