aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-01-22 01:26:03 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-01-22 01:26:03 +0000
commit786abaefa90e3cdc198cd37ff1430f910d7a99ea (patch)
treefe50de86bf15c949ce32051ad7e4c66de2b1d110 /src
parent66704a9a841d861bd97d339237915296cf6f5e3b (diff)
downloadpaludis-786abaefa90e3cdc198cd37ff1430f910d7a99ea.tar.gz
paludis-786abaefa90e3cdc198cd37ff1430f910d7a99ea.tar.xz
Fix GCC 4.3 build, thanks to Almathea.
Diffstat (limited to 'src')
-rw-r--r--src/clients/adjutrix/adjutrix.cc1
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc1
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc5
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc3
-rw-r--r--src/clients/reconcilio/reconcilio.cc1
-rw-r--r--src/clients/reconcilio/util/wildcard_expander.cc3
-rw-r--r--src/output/console_install_task.cc8
7 files changed, 15 insertions, 7 deletions
diff --git a/src/clients/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc
index 42c9e18a9..e232af572 100644
--- a/src/clients/adjutrix/adjutrix.cc
+++ b/src/clients/adjutrix/adjutrix.cc
@@ -35,6 +35,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/environments/no_config/no_config_environment.hh>
#include <iostream>
+#include <cstdlib>
#include <unistd.h>
using namespace paludis;
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc b/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc
index e8e4bddff..8f65a3200 100644
--- a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc
@@ -27,6 +27,7 @@
#include <test/test_framework.hh>
#include <unistd.h>
+#include <cstdlib>
using namespace broken_linkage_finder;
diff --git a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc b/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
index 19491e0aa..76ccd838d 100644
--- a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
@@ -37,6 +37,7 @@
#include <algorithm>
#include <cerrno>
+#include <cstring>
#include <fstream>
#include <map>
#include <set>
@@ -152,7 +153,7 @@ ElfLinkageChecker::check_file(const FSEntry & file)
std::ifstream stream(stringify(file).c_str());
if (! stream)
- throw FSError("Error opening file '" + stringify(file) + "': " + strerror(errno));
+ throw FSError("Error opening file '" + stringify(file) + "': " + std::strerror(errno));
return _imp->check_elf<Elf32Type>(file, stream) || _imp->check_elf<Elf64Type>(file, stream);
}
@@ -305,7 +306,7 @@ ElfLinkageChecker::need_breakage_added(
std::ifstream stream(stringify(file).c_str());
if (! stream)
{
- Log::get_instance()->message(ll_warning, lc_no_context, "Error opening '" + stringify(file) + "': " + strerror(errno));
+ Log::get_instance()->message(ll_warning, lc_no_context, "Error opening '" + stringify(file) + "': " + std::strerror(errno));
continue;
}
diff --git a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc b/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
index d5ce47bfa..36db4c085 100644
--- a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
@@ -31,6 +31,7 @@
#include <paludis/util/tokeniser.hh>
#include <algorithm>
+#include <cstring>
#include <cerrno>
#include <fstream>
#include <functional>
@@ -91,7 +92,7 @@ LibtoolLinkageChecker::check_file(const FSEntry & file)
std::ifstream stream(stringify(file).c_str());
if (! stream)
- throw FSError("Error opening file '" + stringify(file) + "': " + strerror(errno));
+ throw FSError("Error opening file '" + stringify(file) + "': " + std::strerror(errno));
KeyValueConfigFileOptions opts;
opts += kvcfo_disallow_space_around_equals;
diff --git a/src/clients/reconcilio/reconcilio.cc b/src/clients/reconcilio/reconcilio.cc
index 109ca3e15..03679f22c 100644
--- a/src/clients/reconcilio/reconcilio.cc
+++ b/src/clients/reconcilio/reconcilio.cc
@@ -32,6 +32,7 @@
#include <src/output/colour.hh>
#include <iostream>
+#include <cstdlib>
using namespace paludis;
diff --git a/src/clients/reconcilio/util/wildcard_expander.cc b/src/clients/reconcilio/util/wildcard_expander.cc
index b88292950..f28695f78 100644
--- a/src/clients/reconcilio/util/wildcard_expander.cc
+++ b/src/clients/reconcilio/util/wildcard_expander.cc
@@ -28,6 +28,7 @@
#include <vector>
#include <cerrno>
+#include <cstring>
#include <glob.h>
using namespace paludis;
@@ -98,7 +99,7 @@ namespace
case GLOB_ABORTED:
globfree(&g);
- throw WildcardExpansionError("Error running glob(): " + stringify(strerror(errno)));
+ throw WildcardExpansionError("Error running glob(): " + stringify(std::strerror(errno)));
default:
globfree(&g);
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 9de4e6cb6..cc8550dbc 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -51,6 +51,8 @@
#include <iostream>
#include <iomanip>
#include <limits>
+#include <cstring>
+#include <cstdlib>
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -88,7 +90,7 @@ namespace
}
cerr << endl;
cerr << "Exiting with failure" << endl;
- exit(EXIT_FAILURE);
+ std::exit(EXIT_FAILURE);
}
}
@@ -1725,14 +1727,14 @@ ConsoleInstallTask::show_resume_command(const std::string & resume_command_templ
else
{
cerr << "Resume command NOT saved to file: " << file_name << " due to error "
- << strerror(errno) << endl;
+ << std::strerror(errno) << endl;
cerr << "Resume command: " << file_name << endl;
}
}
else
{
cerr << "Resume command NOT saved to file: " << file_name << " due to error "
- << strerror(errno) << endl;
+ << std::strerror(errno) << endl;
cerr << "Resume command: " << resume_command << endl;
}
}