From daa1352ed3d2bb4bc6aa0f0e7f22be3f0908942d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 11 May 2019 17:17:20 +0200 Subject: Run unifdef -DAPT_{8,9,10,15}_CLEANER_HEADERS --- apt-pkg/contrib/arfile.h | 3 --- apt-pkg/contrib/cdromutl.h | 3 --- apt-pkg/contrib/cmndline.h | 3 --- apt-pkg/contrib/configuration.h | 3 --- apt-pkg/contrib/extracttar.h | 5 ----- apt-pkg/contrib/fileutl.h | 3 --- apt-pkg/contrib/gpgv.h | 3 --- apt-pkg/contrib/hashes.h | 9 --------- apt-pkg/contrib/hashsum_template.h | 9 --------- apt-pkg/contrib/macros.h | 20 -------------------- apt-pkg/contrib/md5.h | 9 --------- apt-pkg/contrib/mmap.h | 4 ---- apt-pkg/contrib/netrc.h | 7 ------- apt-pkg/contrib/progress.h | 3 --- apt-pkg/contrib/sha1.h | 9 --------- apt-pkg/contrib/sha2.h | 5 ----- apt-pkg/contrib/strutl.h | 8 -------- 17 files changed, 106 deletions(-) (limited to 'apt-pkg/contrib') diff --git a/apt-pkg/contrib/arfile.h b/apt-pkg/contrib/arfile.h index cf454941e..acbe2c3f8 100644 --- a/apt-pkg/contrib/arfile.h +++ b/apt-pkg/contrib/arfile.h @@ -16,9 +16,6 @@ #include #include -#ifndef APT_8_CLEANER_HEADERS -#include -#endif class FileFd; diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 4e07e42f6..d355a297e 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -11,9 +11,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -using std::string; -#endif // mount cdrom, DeviceName (e.g. /dev/sr0) is optional bool MountCdrom(std::string Path, std::string DeviceName=""); diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index bdd4f6e8f..66e0e16d8 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -45,9 +45,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -#include -#endif class Configuration; diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index b5dfe721f..33cdfbfe9 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -35,9 +35,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -using std::string; -#endif class Configuration { diff --git a/apt-pkg/contrib/extracttar.h b/apt-pkg/contrib/extracttar.h index adde21352..8d4c17924 100644 --- a/apt-pkg/contrib/extracttar.h +++ b/apt-pkg/contrib/extracttar.h @@ -18,11 +18,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -#include -#include -using std::min; -#endif class pkgDirStream; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index cc0191192..f80457cd3 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -30,9 +30,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -using std::string; -#endif /* Define this for python-apt */ #define APT_HAS_GZIP 1 diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 2a4cdad72..4d48e2914 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -14,9 +14,6 @@ #include #include -#ifndef APT_10_CLEANER_HEADERS -#include -#endif class FileFd; diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index c636852ec..e9b8a0519 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -20,15 +20,6 @@ #include #include -#ifndef APT_8_CLEANER_HEADERS -using std::min; -using std::vector; -#endif -#ifndef APT_10_CLEANER_HEADERS -#include -#include -#include -#endif class FileFd; diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 52b2cbab3..12c46e77b 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -15,15 +15,6 @@ #include -#ifndef APT_10_CLEANER_HEADERS -#include -#include -#include -#endif -#ifndef APT_8_CLEANER_HEADERS -using std::string; -using std::min; -#endif class FileFd; diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 3648390ce..df85b7856 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -116,26 +116,6 @@ #define APT_HOT #endif -#ifndef APT_10_CLEANER_HEADERS -#if APT_GCC_VERSION >= 0x0300 - #define __must_check __attribute__ ((warn_unused_result)) - #define __deprecated __attribute__ ((deprecated)) - #define __attrib_const __attribute__ ((__const__)) - #define __like_printf(n) __attribute__((format(printf, n, n + 1))) -#else - #define __must_check /* no warn_unused_result */ - #define __deprecated /* no deprecated */ - #define __attrib_const /* no const attribute */ - #define __like_printf(n) /* no like-printf */ -#endif -#if APT_GCC_VERSION >= 0x0403 - #define __cold __attribute__ ((__cold__)) - #define __hot __attribute__ ((__hot__)) -#else - #define __cold /* no cold marker */ - #define __hot /* no hot marker */ -#endif -#endif #if __GNUC__ >= 4 #define APT_IGNORE_DEPRECATED_PUSH \ diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 38b6c6876..d1287c573 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -26,15 +26,6 @@ #include "hashsum_template.h" -#ifndef APT_10_CLEANER_HEADERS -#include -#include -#include -#endif -#ifndef APT_8_CLEANER_HEADERS -using std::string; -using std::min; -#endif typedef HashSumValue<128> MD5SumValue; diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 3af1f47fb..76db7b542 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -29,10 +29,6 @@ #include -#ifndef APT_8_CLEANER_HEADERS -#include -using std::string; -#endif class FileFd; diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 96a5a0973..c8a03a4b7 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -20,14 +20,7 @@ #include #include -#ifndef APT_8_CLEANER_HEADERS -#include -#endif -#ifndef APT_15_CLEANER_HEADERS -#define DOT_CHAR "." -#define DIR_CHAR "/" -#endif class URI; class FileFd; diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 903e6613e..850d009fa 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -24,9 +24,6 @@ #include #include -#ifndef APT_8_CLEANER_HEADERS -using std::string; -#endif class Configuration; class OpProgress diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index dffb95033..7149da97f 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -15,15 +15,6 @@ #include "hashsum_template.h" -#ifndef APT_10_CLEANER_HEADERS -#include -#include -#include -#endif -#ifndef APT_8_CLEANER_HEADERS -using std::string; -using std::min; -#endif typedef HashSumValue<160> SHA1SumValue; diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index e1a8c6c6e..5489007a2 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -18,11 +18,6 @@ #include "hashsum_template.h" #include "sha2_internal.h" -#ifndef APT_10_CLEANER_HEADERS -#include -#include -#include -#endif typedef HashSumValue<512> SHA512SumValue; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 3853d5ba6..367b04ef6 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -26,14 +26,6 @@ #include "macros.h" -#ifndef APT_10_CLEANER_HEADERS -#include -#endif -#ifndef APT_8_CLEANER_HEADERS -using std::string; -using std::vector; -using std::ostream; -#endif namespace APT { namespace String { -- cgit v1.2.3