diff options
author | joerg@mysql.com <> | 2005-04-26 12:03:37 +0200 |
---|---|---|
committer | joerg@mysql.com <> | 2005-04-26 12:03:37 +0200 |
commit | 49ac2dac3e148b994859ab8b43de40270ed409b5 (patch) | |
tree | 456de671941d212a8a4e3a9cea7082b09ca1d0fd /sql/stacktrace.h | |
parent | b890c05b4dd3461879a30da3b9cbf44e8f7b6040 (diff) | |
parent | 70ed0ea4cb109262fe3ba18705f94f4f70fcf239 (diff) | |
download | mariadb-git-49ac2dac3e148b994859ab8b43de40270ed409b5.tar.gz |
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
Diffstat (limited to 'sql/stacktrace.h')
-rw-r--r-- | sql/stacktrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/stacktrace.h b/sql/stacktrace.h index 980e1ea07eb..d5d1e05ef0e 100644 --- a/sql/stacktrace.h +++ b/sql/stacktrace.h @@ -18,7 +18,7 @@ extern "C" { #endif -#ifdef HAVE_LINUXTHREADS +#ifdef TARGET_OS_LINUX #if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) #undef HAVE_STACKTRACE #define HAVE_STACKTRACE @@ -30,7 +30,7 @@ extern char* heap_start; void print_stacktrace(gptr stack_bottom, ulong thread_stack); void safe_print_str(const char* name, const char* val, int max_len); #endif /* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */ -#endif /* HAVE_LINUXTHREADS */ +#endif /* TARGET_OS_LINUX */ /* Define empty prototypes for functions that are not implemented */ #ifndef HAVE_STACKTRACE |