Merge remote-tracking branch 'mvo/feature/apt-ftparchive-srccache2' into debian/sid

[apt.git] / cmdline / apt-dump-solver.cc

diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index dab0cc6fd63a0059f6eb3f72c0ce08bcc2464cf5..04e13bde902decdb722e6f7826853fd1c38e3ed5 100644 (file)
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -9,18 +9,21 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/edsp.h>
 
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/edsp.h>
 

-#include <config.h>
-
+#include <string.h>
+#include <unistd.h>

 #include <cstdio>
 #include <cstdio>

+#include <iostream>
+
+#include <config.h>

                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowHelp() {
+static bool ShowHelp() {

 
        std::cout <<
 
        std::cout <<

-               PACKAGE " " VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
+               PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<

                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"
                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"