summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-04-20 20:38:57 +0200
committerunknown <joerg@mysql.com>2005-04-20 20:38:57 +0200
commitb6a4a2f41cb7aa04b59d8017070a69cd6f4c5082 (patch)
treeb82b278a25646c3778f5067f40248a6aa21d3700 /sql
parent677fbc7d4e34dff14aaf49efa114bc85aa986da1 (diff)
downloadmariadb-git-b6a4a2f41cb7aa04b59d8017070a69cd6f4c5082.tar.gz
Step 2 of the switch to support configuration with NPTL:
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. configure.in: Step 2 of the switch to support configuration with NPTL: Define a new CPP symbol that the target OS is Linux. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. include/my_global.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. mysys/thr_mutex.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. tools/mysqlmanager.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
Diffstat (limited to 'sql')
-rw-r--r--sql/stacktrace.c4
-rw-r--r--sql/stacktrace.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index 322d647e741..838f547dc02 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -43,7 +43,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
fputc('\n', stderr);
}
-#ifdef HAVE_LINUXTHREADS
+#ifdef TARGET_OS_LINUX
#define SIGRETURN_FRAME_COUNT 2
#if defined(__alpha__) && defined(__GNUC__)
@@ -201,7 +201,7 @@ end:
stack trace is much more helpful in diagnosing the problem, so please do \n\
resolve it\n");
}
-#endif /* HAVE_LINUXTHREADS */
+#endif /* TARGET_OS_LINUX */
#endif /* HAVE_STACKTRACE */
/* Produce a core for the thread */
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