From: Michihiro NAKAJIMA Date: Tue, 24 Mar 2009 09:29:24 +0000 (-0400) Subject: Remove useless '#ifndef LIST_H' condition. X-Git-Tag: v2.7.0~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63eafccd215474d2ff201d3478fa783e0371fccd;p=thirdparty%2Flibarchive.git Remove useless '#ifndef LIST_H' condition. SVN-Revision: 839 --- diff --git a/cpio/cpio_cygwin.c b/cpio/cpio_cygwin.c index f2157c55f..2c8d072bc 100644 --- a/cpio/cpio_cygwin.c +++ b/cpio/cpio_cygwin.c @@ -42,7 +42,6 @@ #include "cpio.h" -#ifndef LIST_H static int _is_privileged(HANDLE thandle, const char *sidlist[]) { @@ -134,6 +133,4 @@ bsdcpio_is_privileged() return (ret); } -#endif /* LIST_H */ - #endif diff --git a/cpio/cpio_windows.c b/cpio/cpio_windows.c index 4742aead0..25c680de2 100644 --- a/cpio/cpio_windows.c +++ b/cpio/cpio_windows.c @@ -42,7 +42,6 @@ #include "cpio.h" -#ifndef LIST_H int bsdcpio_is_privileged() { @@ -56,6 +55,4 @@ bsdcpio_is_privileged() return (ret); } -#endif /* LIST_H */ - #endif diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt index cfb4fb97f..ef7ccad68 100644 --- a/cpio/test/CMakeLists.txt +++ b/cpio/test/CMakeLists.txt @@ -48,7 +48,6 @@ IF(ENABLE_CPIO AND ENABLE_TEST) # Register target # ADD_EXECUTABLE(bsdcpio_test ${bsdcpio_test_SOURCES}) - SET_PROPERTY(TARGET bsdcpio_test PROPERTY COMPILE_DEFINITIONS LIST_H) SET(num 0) FOREACH(test ${bsdcpio_test_SOURCES}) IF(test MATCHES "^test_[^/]+[.]c$") diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt index 6d4e6a3af..b87dabce9 100644 --- a/libarchive/test/CMakeLists.txt +++ b/libarchive/test/CMakeLists.txt @@ -104,7 +104,7 @@ IF(ENABLE_TEST) ADD_EXECUTABLE(libarchive_test ${libarchive_test_SOURCES}) TARGET_LINK_LIBRARIES(libarchive_test ${ADDITIONAL_LIBS}) SET_PROPERTY(TARGET libarchive_test PROPERTY COMPILE_DEFINITIONS - LIBARCHIVE_STATIC LIST_H) + LIBARCHIVE_STATIC) SET(num 0) FOREACH(test ${libarchive_test_SOURCES}) IF(test MATCHES "^test_[^/]+[.]c$") diff --git a/tar/bsdtar_cygwin.c b/tar/bsdtar_cygwin.c index d31f1122d..0408157f3 100644 --- a/tar/bsdtar_cygwin.c +++ b/tar/bsdtar_cygwin.c @@ -42,7 +42,6 @@ #include "bsdtar.h" -#ifndef LIST_H static int _is_privileged(HANDLE thandle, const char *sidlist[]) { @@ -135,7 +134,4 @@ bsdtar_is_privileged(struct bsdtar *bsdtar) return (ret); } - -#endif /* LIST_H */ - #endif diff --git a/tar/bsdtar_windows.c b/tar/bsdtar_windows.c index 5a566ac3b..9fc48aa8b 100644 --- a/tar/bsdtar_windows.c +++ b/tar/bsdtar_windows.c @@ -42,7 +42,6 @@ #include "bsdtar.h" -#ifndef LIST_H int bsdtar_is_privileged(struct bsdtar *bsdtar) { @@ -141,6 +140,4 @@ try_plain: write_hierarchy(bsdtar, a, path); } -#endif /* LIST_H */ - #endif diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt index b28325423..30f5713a9 100644 --- a/tar/test/CMakeLists.txt +++ b/tar/test/CMakeLists.txt @@ -38,7 +38,6 @@ IF(ENABLE_TAR AND ENABLE_TEST) # Register target # ADD_EXECUTABLE(bsdtar_test ${bsdtar_test_SOURCES}) - SET_PROPERTY(TARGET bsdtar_test PROPERTY COMPILE_DEFINITIONS LIST_H) SET(num 0) FOREACH(test ${bsdtar_test_SOURCES}) IF(test MATCHES "^test_[^/]+[.]c$")