UNIXWARE removal

7 files changed, 2 insertions, 92 deletions

diff --git a/extra/resolveip.c b/extra/resolveip.c
index f8cff2a976c..eb05886d5b1 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -32,7 +32,7 @@
 #include <my_net.h>
 #include <my_getopt.h>
 
-#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
+#if !defined(_AIX) && !defined(h_errno)
 extern int h_errno;
 #endif
 
diff --git a/include/m_string.h b/include/m_string.h
index 8b23d765e91..e73f5c11487 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -34,19 +34,6 @@
 /* need by my_vsnprintf */
 #include <stdarg.h> 
 
-/* Correct some things for UNIXWARE7 */
-#ifdef HAVE_UNIXWARE7_THREADS
-#undef HAVE_STRINGS_H
-#undef HAVE_MEMORY_H
-#define HAVE_MEMCPY
-#ifndef HAVE_MEMMOVE
-#define HAVE_MEMMOVE
-#endif
-#undef HAVE_BCMP
-#undef bcopy
-#undef bcmp
-#undef bzero
-#endif /* HAVE_UNIXWARE7_THREADS */
 #ifdef _AIX
 #undef HAVE_BCMP
 #endif
diff --git a/include/my_global.h b/include/my_global.h
index 472a958f9c6..cd0eda8aa45 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -208,7 +208,6 @@
 #undef THREAD
 #undef HAVE_LINUXTHREADS
 #undef HAVE_NPTL
-#undef HAVE_UNIXWARE7_THREADS
 #endif
 
 #ifdef HAVE_THREADS_WITHOUT_SOCKETS
@@ -264,9 +263,6 @@
 #if !defined(_THREAD_SAFE) && !defined(_AIX)
 #define _THREAD_SAFE            /* Required for OSF1 */
 #endif
-#ifdef HAVE_UNIXWARE7_THREADS
-#include <thread.h>
-#else
 #if defined(HPUX10) || defined(HPUX11)
 C_MODE_START			/* HPUX needs this, signal.h bug */
 #include <pthread.h>
@@ -274,7 +270,6 @@ C_MODE_END
 #else
 #include <pthread.h>		/* AIX must have this included first */
 #endif
-#endif /* HAVE_UNIXWARE7_THREADS */
 #if !defined(SCO) && !defined(_REENTRANT)
 #define _REENTRANT	1	/* Threads requires reentrant code */
 #endif
diff --git a/include/my_no_pthread.h b/include/my_no_pthread.h
index f86e8e60642..c47da5b1978 100644
--- a/include/my_no_pthread.h
+++ b/include/my_no_pthread.h
@@ -27,10 +27,6 @@
   Case in point: 'mf_keycache.c'
 */
 #if defined(__WIN__)
-
-#elif defined(HAVE_UNIXWARE7_THREADS)
-/* #include <thread.h>   Currently, not relevant. Enable if needed. */
-
 #else /* Normal threads */
 #include <pthread.h>
 
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 1bed3b4ccfb..acd1d2b558b 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -142,68 +142,6 @@ void pthread_exit(void *a);	 /* was #define pthread_exit(A) ExitThread(A)*/
 /*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
 #define my_pthread_getprio(thread_id) pthread_dummy(0)
 
-#elif defined(HAVE_UNIXWARE7_THREADS)
-
-#include <thread.h>
-#include <synch.h>
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-
-#define HAVE_NONPOSIX_SIGWAIT
-#define pthread_t thread_t
-#define pthread_cond_t cond_t
-#define pthread_mutex_t mutex_t
-#define pthread_key_t thread_key_t
-typedef int pthread_attr_t;			/* Needed by Unixware 7.0.0 */
-
-#define pthread_key_create(A,B) thr_keycreate((A),(B))
-#define pthread_key_delete(A) thr_keydelete(A)
-
-#define pthread_handler_t EXTERNC void *
-#define pthread_key(T,V) pthread_key_t V
-
-void *	my_pthread_getspecific_imp(pthread_key_t key);
-#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
-#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,V)
-
-#define pthread_setspecific(A,B) thr_setspecific(A,B)
-#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,V)
-
-#define pthread_create(A,B,C,D) thr_create(NULL,65536L,(C),(D),THR_DETACHED,(A))
-#define pthread_cond_init(a,b) cond_init((a),USYNC_THREAD,NULL)
-#define pthread_cond_destroy(a) cond_destroy(a)
-#define pthread_cond_signal(a) cond_signal(a)
-#define pthread_cond_wait(a,b) cond_wait((a),(b))
-#define pthread_cond_timedwait(a,b,c) cond_timedwait((a),(b),(c))
-#define pthread_cond_broadcast(a) cond_broadcast(a)
-
-#define pthread_mutex_init(a,b) mutex_init((a),USYNC_THREAD,NULL)
-#define pthread_mutex_lock(a) mutex_lock(a)
-#define pthread_mutex_unlock(a) mutex_unlock(a)
-#define pthread_mutex_destroy(a) mutex_destroy(a)
-
-#define pthread_self() thr_self()
-#define pthread_exit(A) thr_exit(A)
-#define pthread_equal(A,B) (((A) == (B)) ? 1 : 0)
-#define pthread_kill(A,B) thr_kill((A),(B))
-#define HAVE_PTHREAD_KILL
-
-#define pthread_sigmask(A,B,C) thr_sigsetmask((A),(B),(C))
-
-extern int my_sigwait(const sigset_t *set,int *sig);
-
-#define pthread_detach_this_thread() pthread_dummy(0)
-
-#define pthread_attr_init(A) pthread_dummy(0)
-#define pthread_attr_destroy(A) pthread_dummy(0)
-#define pthread_attr_setscope(A,B) pthread_dummy(0)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define my_pthread_setprio(A,B) pthread_dummy (0)
-#define my_pthread_getprio(A) pthread_dummy (0)
-#define my_pthread_attr_setprio(A,B) pthread_dummy(0)
-
 #else /* Normal threads */
 
 #ifdef HAVE_rts_threads
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 7408a320509..88b8e457bd6 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -91,9 +91,6 @@ my_bool my_init(void)
   sigfillset(&my_signals);		/* signals blocked by mf_brkhant */
 #endif
 #endif /* THREAD */
-#ifdef UNIXWARE_7
-  (void) isatty(0);			/* Go around connect() bug in UW7 */
-#endif
   {
     DBUG_ENTER("my_init");
     DBUG_PROCESS((char*) (my_progname ? my_progname : "unknown"));
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index b8eeb0a3f3f..80aa6b37dbc 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -76,9 +76,6 @@ void my_pthread_attr_setprio(pthread_attr_t *attr, int priority)
 
 #ifdef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
 #undef pthread_getspecific
-#ifdef HAVE_UNIXWARE7_THREADS
-#define pthread_getspecific thr_getspecific
-#endif
 
 void *my_pthread_getspecific_imp(pthread_key_t key)
 {
@@ -429,7 +426,7 @@ int sigwait(sigset_t *setp, int *sigp)
 ** Patches for AIX and DEC OSF/1 3.2
 *****************************************************************************/
 
-#if (defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT) && !defined(HAVE_UNIXWARE7_THREADS)) || defined(HAVE_DEC_3_2_THREADS)
+#if defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT)
 
 #include <netdb.h>