diff options
author | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
commit | da7b4a0824397b1c724cdf9a9b03b642ef8610ae (patch) | |
tree | 33ffbad3b60850d7aaaa2e6c79990403e110b2c2 /lib/libarchive/test/test_write_disk_perms.c | |
parent | 4f7f14505ade23cf1713dac8e039845e724b1326 (diff) | |
download | FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.zip FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.tar.gz |
Style: Use ARCHIVE_VERSION_NUMBER to conditionalize tests on
the particular libarchive version being tested instead of the
deprecated ARCHIVE_API_VERSION and ARCHIVE_VERSION_STAMP macros.
Diffstat (limited to 'lib/libarchive/test/test_write_disk_perms.c')
-rw-r--r-- | lib/libarchive/test/test_write_disk_perms.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libarchive/test/test_write_disk_perms.c b/lib/libarchive/test/test_write_disk_perms.c index 15633f6..3db3fdb 100644 --- a/lib/libarchive/test/test_write_disk_perms.c +++ b/lib/libarchive/test/test_write_disk_perms.c @@ -25,7 +25,7 @@ #include "test.h" __FBSDID("$FreeBSD$"); -#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); |