Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / contrib / cmndline.h

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index b201d98550d62aaffad9941b7fc5f5cd9cdda4c8..1802766333a258703d801735c149bd75fb384e0d 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,6 +44,10 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/configuration.h>
+#endif
+
 class Configuration;
 
 class CommandLine
@@ -79,6 +83,12 @@ class CommandLine
    unsigned int FileSize() const;
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
       
+   static char const * GetCommand(Dispatch const * const Map,
+        unsigned int const argc, char const * const * const argv);
+
+   static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
+        char const *ConfName, unsigned long Flags);
+
    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
 };