summaryrefslogtreecommitdiff
path: root/mysys/my_thr_init.c
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-16 01:50:25 -0700
committerunknown <brian@zim.(none)>2006-04-16 01:50:25 -0700
commit2623949e12a76935b365af2737634630461a61f7 (patch)
tree0302df0e47ad8749257dda529e671c3500a58983 /mysys/my_thr_init.c
parentcc62983ca2be9fe0559d3f5a326bb7284c08c4cb (diff)
downloadmariadb-git-2623949e12a76935b365af2737634630461a61f7.tar.gz
This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree)
include/my_global.h: mit_thread removal include/my_pthread.h: mit_thread removal mysys/my_file.c: mit_thread removal mysys/my_pthread.c: Removal of mit_thread mysys/my_thr_init.c: Removal of mit_thread
Diffstat (limited to 'mysys/my_thr_init.c')
-rw-r--r--mysys/my_thr_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index 7fb7439aa82..9013cd6e79d 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -217,7 +217,7 @@ void my_thread_end(void)
tmp->dbug=0;
}
#endif
-#if !defined(__bsdi__) && !defined(__OpenBSD__) || defined(HAVE_mit_thread)
+#if !defined(__bsdi__) && !defined(__OpenBSD__)
/* bsdi and openbsd 3.5 dumps core here */
pthread_cond_destroy(&tmp->suspend);
#endif
@@ -260,7 +260,7 @@ long my_thread_id()
{
#if defined(HAVE_PTHREAD_GETSEQUENCE_NP)
return pthread_getsequence_np(pthread_self());
-#elif (defined(__sun) || defined(__sgi) || defined(__linux__)) && !defined(HAVE_mit_thread)
+#elif (defined(__sun) || defined(__sgi) || defined(__linux__))
return pthread_self();
#else
return my_thread_var->id;