From cc62983ca2be9fe0559d3f5a326bb7284c08c4cb Mon Sep 17 00:00:00 2001
From: unknown <brian@zim.(none)>
Date: Sat, 15 Apr 2006 18:17:32 -0700
Subject: Final patch to remove the last of the OS2 support.

client/client_priv.h:
  OS2 removal
client/mysql.cc:
  OS2 removal
dbug/dbug.c:
  OS2 removal
include/m_string.h:
  OS2 removal
include/my_global.h:
  Cleanup for have_mit
libmysql/dll.c:
  OS2 removal
libmysql/get_password.c:
  OS2 removal
libmysql/libmysql.c:
  OS2 removal
libmysql/manager.c:
  OS2 removal
sql-common/client.c:
  OS2 removal
sql/event_executor.cc:
  OS2 removal
sql/hostname.cc:
  OS2 removal
sql/log.cc:
  OS2 removal
sql/log_event.h:
  OS2 removal
sql/my_lock.c:
  OS2 removal
sql/mysql_priv.h:
  OS2 removal
sql/mysqld.cc:
  OS2 removal
sql/net_serv.cc:
  OS2 removal
sql/repl_failsafe.cc:
  OS2 removal
sql/slave.cc:
  OS2 removal
sql/sql_base.cc:
  OS2 removal
sql/sql_insert.cc:
  OS2 removal
sql/sql_load.cc:
  OS2 removal
sql/sql_parse.cc:
  OS2 removal
sql/sql_table.cc:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal
storage/ndb/src/mgmclient/main.cpp:
  OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
  OS2 removal
vio/vio.c:
  OS2 removal
vio/viosocket.c:
  OS2 removal
vio/viossl.c:
  OS2 removal
---
 include/m_string.h  | 6 +++---
 include/my_global.h | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/m_string.h b/include/m_string.h
index c580e38e177..d7086555b1e 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -52,7 +52,7 @@
 #endif
 
 /*  This is needed for the definitions of bzero... on solaris */
-#if defined(HAVE_STRINGS_H) && !defined(HAVE_mit_thread)
+#if defined(HAVE_STRINGS_H)
 #include <strings.h>
 #endif
 
@@ -95,7 +95,7 @@ extern "C" {
 extern void *(*my_str_malloc)(size_t);
 extern void (*my_str_free)(void *);
 
-#if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread)
+#if defined(HAVE_STPCPY)
 #define strmov(A,B) stpcpy((A),(B))
 #ifndef stpcpy
 extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
@@ -243,7 +243,7 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error);
 #ifdef HAVE_LONG_LONG
 extern char *longlong2str(longlong val,char *dst,int radix);
 extern char *longlong10_to_str(longlong val,char *dst,int radix);
-#if (!defined(HAVE_STRTOULL) || defined(HAVE_mit_thread)) || defined(NO_STRTOLL_PROTO)
+#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO)
 extern longlong strtoll(const char *str, char **ptr, int base);
 extern ulonglong strtoull(const char *str, char **ptr, int base);
 #endif
diff --git a/include/my_global.h b/include/my_global.h
index 500481fd6b8..42a93fb5e63 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -206,7 +206,6 @@
 /* The client defines this to avoid all thread code */
 #if defined(UNDEF_THREADS_HACK)
 #undef THREAD
-#undef HAVE_mit_thread
 #undef HAVE_LINUXTHREADS
 #undef HAVE_NPTL
 #undef HAVE_UNIXWARE7_THREADS
-- 
cgit v1.2.1