diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-14 10:53:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-14 10:53:32 +0100 |
| commit | db8f698c8a03bcc920b9453f8822fbbd8ec7ea66 (patch) | |
| tree | 3c12c81dfdf1ea5d2af805fb5f93daa0b45e408a /include/my_stacktrace.h | |
| parent | 44d335b828440603353d8f1f4dfc6db2cf72ca8c (diff) | |
| download | mariadb-git-db8f698c8a03bcc920b9453f8822fbbd8ec7ea66.tar.gz | |
new configure option: NOT_FOR_DISTRIBUTION
fix safemalloc to compile w/o libbfd.
CMakeLists.txt:
NOT_FOR_DISTRIBUTION option
cmake/readline.cmake:
simplify libedit/readline detection.
never use bundled libedit.
use system readline v6 only if NOT_FOR_DISTRIBUTION=1
configure.cmake:
use libbfd only if NOT_FOR_DISTRIBUTION=1
include/my_stacktrace.h:
link with libbfd even w/o safemalloc.
Diffstat (limited to 'include/my_stacktrace.h')
| -rw-r--r-- | include/my_stacktrace.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 30f0203a43e..a9590a76368 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -55,23 +55,22 @@ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif #endif -/* at the moment, safemalloc is the main user of libbfd */ -#ifndef SAFEMALLOC -#undef HAVE_BFD_H -#endif - #ifdef HAVE_BFD_H #define HAVE_MY_ADDR_RESOLVE 1 #endif -#ifdef HAVE_MY_ADDR_RESOLVE typedef struct { const char *file; const char *func; uint line; } my_addr_loc; + +#ifdef HAVE_MY_ADDR_RESOLVE int my_addr_resolve(void *ptr, my_addr_loc *loc); const char *my_addr_resolve_init(); +#else +#define my_addr_resolve_init() (0) +#define my_addr_resolve(A,B) (1) #endif #ifdef HAVE_WRITE_CORE |