projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
more cleanup
[awesomized/libmemcached]
/
src
/
libmemcached
/
backtrace.cc
diff --git
a/src/libmemcached/backtrace.cc
b/src/libmemcached/backtrace.cc
index 3687d62c873bd666bd67d750cee1aebe7d2c8296..fb19b3aa1fc066e855dea1d57b99ffc4ee97d2d9 100644
(file)
--- a/
src/libmemcached/backtrace.cc
+++ b/
src/libmemcached/backtrace.cc
@@
-25,11
+25,8
@@
# include BACKTRACE_HEADER
# include BACKTRACE_HEADER
-# if HAVE_ABI____CXA_DEMANGLE
+# if
def
HAVE_ABI____CXA_DEMANGLE
# include <cxxabi.h>
# include <cxxabi.h>
-# define USE_DEMANGLE 1
-# else
-# define USE_DEMANGLE 0
# endif
# ifdef HAVE_DLFCN_H
# endif
# ifdef HAVE_DLFCN_H
@@
-48,8
+45,8
@@
void custom_backtrace(void) {
for (int x = 0; x < stack_frames; x++) {
bool was_demangled = false;
for (int x = 0; x < stack_frames; x++) {
bool was_demangled = false;
- if (USE_DEMANGLE) {
-# ifdef HAVE_DLFCN_H
+# ifdef HAVE_ABI____CXA_DEMANGLE
+#
ifdef HAVE_DLFCN_H
Dl_info dlinfo;
if (dladdr(backtrace_buffer[x], &dlinfo)) {
char demangled_buffer[1024];
Dl_info dlinfo;
if (dladdr(backtrace_buffer[x], &dlinfo)) {
char demangled_buffer[1024];
@@
-71,8
+68,8
@@
void custom_backtrace(void) {
dlinfo.dli_fname);
}
}
dlinfo.dli_fname);
}
}
+# endif
# endif
# endif
- }
if (was_demangled == false) {
fprintf(stderr, "?%d %p in %s\n", x, backtrace_buffer[x], symbollist[x]);
if (was_demangled == false) {
fprintf(stderr, "?%d %p in %s\n", x, backtrace_buffer[x], symbollist[x]);