mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-16 04:14:01 +02:00
2e4d2d36c2
This is a fairly massive update that adds new dependencies. Switched the CMAKE_OPTIONS to use ON/OFF as is done elsewhere. Added a patch fixing compilation with libiconv-stub/full. Add a small debug option to write to syslog debug information. Signed-off-by: Rosen Penev <rosenp@gmail.com>
22 lines
640 B
Diff
22 lines
640 B
Diff
--- a/src/util/string_converter.cc
|
|
+++ b/src/util/string_converter.cc
|
|
@@ -41,15 +41,15 @@ StringConverter::StringConverter(const std::string& from, const std::string& to)
|
|
dirty = false;
|
|
|
|
cd = iconv_open(to.c_str(), from.c_str());
|
|
- if (cd == reinterpret_cast<iconv_t>(-1)) {
|
|
- cd = static_cast<iconv_t>(nullptr);
|
|
+ if (cd == (iconv_t)(-1)) {
|
|
+ cd = (iconv_t)(nullptr);
|
|
throw_std_runtime_error(std::string("iconv: ") + strerror(errno));
|
|
}
|
|
}
|
|
|
|
StringConverter::~StringConverter()
|
|
{
|
|
- if (cd != static_cast<iconv_t>(nullptr))
|
|
+ if (cd != (iconv_t)(nullptr))
|
|
iconv_close(cd);
|
|
}
|
|
|