diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 00:54:37 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 00:54:37 +0100 |
| commit | a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (patch) | |
| tree | e72c9cda1f1b29c9bf0744c2ebf04c43d7b22500 /apt-inst | |
| parent | 699b209e5122f8fcd85fc4666c9b7020286ab0d0 (diff) | |
| download | apt-a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65.tar.gz | |
revert 2184.1.2: do not pollute namespace in headers
The breakage is just to big for now, so guard the change with
#ifndef APT_8_CLEANER_HEADERS and be nice to library users
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 8754e8dcc..e104417c1 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -18,6 +18,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +using std::min; +#endif + class pkgDirStream; class ExtractTar |