You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
773 B
31 lines
773 B
--- conky-1.10.8/src/linux.cc 2018-02-07 17:16:39.000000000 +0300
|
|
+++ conky-1.10.8.new/src/linux.cc 2020-02-22 00:43:52.336620654 +0300
|
|
@@ -37,6 +37,7 @@
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
+#include <clocale>
|
|
#include <sys/types.h>
|
|
#include <sys/sysinfo.h>
|
|
#include <sys/stat.h>
|
|
--- conky-1.10.8/src/luamm.cc 2020-02-22 00:57:25.847867585 +0300
|
|
+++ conky-1.10.8.new/src/luamm.cc 2020-02-22 00:59:29.820510124 +0300
|
|
@@ -23,6 +23,8 @@
|
|
|
|
#include "luamm.hh"
|
|
|
|
+#include <cxxabi.h>
|
|
+
|
|
namespace lua {
|
|
namespace {
|
|
|
|
@@ -57,7 +59,7 @@
|
|
lua_pushstring(l, e.what());
|
|
}
|
|
catch(...) {
|
|
- lua_pushstring(l, ptr->__cxa_exception_type()->name());
|
|
+ lua_pushstring(l, abi::__cxa_current_exception_type()->name());
|
|
}
|
|
return 1;
|
|
}
|