projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Casting fixes for linux.
[m6w6/libmemcached]
/
clients
/
ms_sigsegv.c
diff --git
a/clients/ms_sigsegv.c
b/clients/ms_sigsegv.c
index a91acc96e8ad4f7cf84691b927eb5741ca4b4579..2cdd3017d8ec49c272ca019e59437943cbe1adce 100644
(file)
--- a/
clients/ms_sigsegv.c
+++ b/
clients/ms_sigsegv.c
@@
-23,8
+23,7
@@
#include "ms_memslap.h"
#include "ms_setting.h"
#include "ms_memslap.h"
#include "ms_setting.h"
-#define NO_CPP_DEMANGLE
-#ifndef NO_CPP_DEMANGLE
+#if defined(__cplusplus) && defined(HAVE_ABI_CXA_DEMANGLE)
# include <cxxabi.h>
#endif
# include <cxxabi.h>
#endif
@@
-86,7
+85,7
@@
static void ms_signal_segv(int signum, siginfo_t *info, void *ptr)
break;
const char *symname= dlinfo.dli_sname;
break;
const char *symname= dlinfo.dli_sname;
-# if
ndef NO_CPP_DEMANGLE
+# if
defined(HAVE_ABI_CXA_DEMANGLE) && defined(__cplusplus)
int status;
char *tmp= __cxa_demangle(symname, NULL, 0, &status);
int status;
char *tmp= __cxa_demangle(symname, NULL, 0, &status);
@@
-101,7
+100,7
@@
static void ms_signal_segv(int signum, siginfo_t *info, void *ptr)
(unsigned)(ip - dlinfo.dli_saddr),
dlinfo.dli_fname);
(unsigned)(ip - dlinfo.dli_saddr),
dlinfo.dli_fname);
-# if
ndef NO_CPP_DEMANGLE
+# if
defined(HAVE_ABI_CXA_DEMANGLE) && defined(__cplusplus)
if (tmp)
free(tmp);
# endif
if (tmp)
free(tmp);
# endif