diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
| commit | 443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch) | |
| tree | 3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/contrib/cdromutl.cc | |
| parent | 96273866174c54bdb25813633891f29668d43848 (diff) | |
| parent | f352743312edeebf666e1c8304cdc4baf457469f (diff) | |
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/contrib/cdromutl.cc')
| -rw-r--r-- | apt-pkg/contrib/cdromutl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index e25caf1a5..187f6bd59 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -10,6 +10,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include<config.h> + #include <apt-pkg/cdromutl.h> #include <apt-pkg/error.h> #include <apt-pkg/md5.h> @@ -17,8 +19,6 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> -#include <apti18n.h> - #include <sys/wait.h> #include <sys/statvfs.h> #include <dirent.h> @@ -26,8 +26,12 @@ #include <sys/stat.h> #include <unistd.h> #include <stdio.h> + +#include <apti18n.h> /*}}}*/ +using std::string; + // IsMounted - Returns true if the mount point is mounted /*{{{*/ // --------------------------------------------------------------------- /* This is a simple algorithm that should always work, we stat the mount point |