diff options
author | Michael Vogt <mvo@debian.org> | 2014-03-27 15:19:29 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-03-27 15:19:29 +0100 |
commit | 62f1ee1cc7a5e16ca0cbfbee3c00cefab1892f87 (patch) | |
tree | 811c93213ce371ea12384994615a6e98366221a0 /apt-pkg/cdrom.h | |
parent | 8d50b63f28f0d68ca72b6dc6e50e09cfec9842be (diff) | |
parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'apt-pkg/cdrom.h')
-rw-r--r-- | apt-pkg/cdrom.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 0ed4a6a73..0f2c2cd02 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -1,6 +1,8 @@ #ifndef PKGLIB_CDROM_H #define PKGLIB_CDROM_H +#include <apt-pkg/macros.h> + #include<string> #include<vector> @@ -73,7 +75,7 @@ class pkgCdrom /*{{{*/ bool Add(pkgCdromStatus *log); private: - bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, + APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive); }; /*}}}*/ |