summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-11-28 22:27:15 +0100
committerJulian Andres Klode <jak@debian.org>2015-11-28 22:27:15 +0100
commit7ac9386cb6e272625490fcf3e8183b45e28bbc43 (patch)
tree814a53fd0787a95401db39c9fd9c2ef68881502b /apt-private
parent25ff0797da5bc59ad4c322c7f1ea25664be8a461 (diff)
Revert "appease adequate with some weak symbols for -private"
This reverts commit 28f24d3dad1844af316337d565ba2ebc11c8ce97. This fails on Ubuntu as they build with -Bsymbolic-functions.
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-cmndline.cc4
-rw-r--r--apt-private/private-cmndline.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 9c5eae470..4231c4f0e 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -514,7 +514,3 @@ unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::D
return Errors == true ? 100 : 0;
}
/*}}}*/
-
-// weak symbols
-bool ShowHelp(CommandLine &) { return false; }
-std::vector<aptDispatchWithHelp> GetCommands() { return {}; }
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 4819adce1..819eb77cc 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -23,14 +23,14 @@ enum class APT_CMD {
APT_SORTPKG,
};
-APT_PUBLIC bool ShowHelp(CommandLine &CmdL) APT_WEAK;
+bool ShowHelp(CommandLine &CmdL);
struct aptDispatchWithHelp
{
const char *Match;
bool (*Handler)(CommandLine &);
const char *Help;
};
-APT_PUBLIC std::vector<aptDispatchWithHelp> GetCommands() APT_WEAK;
+std::vector<aptDispatchWithHelp> GetCommands();
APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]);