From aa0a06d2b59d9607a531c5d009e4bfa7a5a11390 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 3 Mar 2008 21:11:59 +0200 Subject: [PATCH] Added support for stacktrace compiled SRT for apps using the SRT. --- lib/silcutil/silcruntime.h.in | 6 ++++++ lib/silcutil/stacktrace.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/silcutil/silcruntime.h.in b/lib/silcutil/silcruntime.h.in index a80d3832..80539dab 100644 --- a/lib/silcutil/silcruntime.h.in +++ b/lib/silcutil/silcruntime.h.in @@ -51,6 +51,7 @@ configured/compiled. */ @__SILC_HAVE_PTHREAD@ @__SILC_ENABLE_DEBUG@ +@__SILC_ENABLE_STACKTRACE@ /* Types */ #define SILC_SIZEOF_LONG_LONG @SILC_SIZEOF_LONG_LONG@ @@ -190,6 +191,11 @@ extern "C" { #define SILC_DEBUG 1 #endif /* __SILC_ENABLE_DEBUG */ +#ifdef __SILC_ENABLE_STACKTRACE +#undef SILC_STACKTRACE +#define SILC_STACKTRACE 1 +#endif /* __SILC_ENABLE_STACKTRACE */ + /* SILC Runtime Toolkit includes */ #include #include diff --git a/lib/silcutil/stacktrace.h b/lib/silcutil/stacktrace.h index ef4db5d8..9463e120 100644 --- a/lib/silcutil/stacktrace.h +++ b/lib/silcutil/stacktrace.h @@ -24,7 +24,8 @@ #error "Do not include internal header file directly" #endif -#if defined(__GNUC__) && defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) +#if (defined(__GNUC__) && defined(HAVE_EXECINFO_H) && \ + defined(HAVE_BACKTRACE)) || defined(__SILC_ENABLE_STACKTRACE) #undef strdup #define silc_malloc(s) silc_st_malloc((s), __FILE__, __LINE__) -- 2.24.0