summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-17 15:56:59 -0700
committerunknown <brian@zim.(none)>2006-04-17 15:56:59 -0700
commitd3fd3bceeeadbe176d2d705882561d4a2fe83227 (patch)
tree5a95e715a40d97d44f0db1dad2b9b451e8d94617 /mysys
parentb1fe06dcc1bd31070a8bd20b6f677c42f7d35e89 (diff)
downloadmariadb-git-d3fd3bceeeadbe176d2d705882561d4a2fe83227.tar.gz
UNIXWARE removal
include/m_string.h: UNIXWare removal include/my_global.h: UNIXWare removal. include/my_no_pthread.h: UNIXWare removal include/my_pthread.h: UNIXWare removal mysys/my_init.c: UNIXWare removal mysys/my_pthread.c: UNIXWare removal
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_init.c3
-rw-r--r--mysys/my_pthread.c5
2 files changed, 1 insertions, 7 deletions
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>