blob: 2fc49fa9cf2523a78e645a5c5dc34b698e65002a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- 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;
}
|
GitWeb
