Another long patch to remove the rest of the OS2 support.

include/config-win.h:
  Removing OS2 stuff
include/errmsg.h:
  Removing OS2 stuff
include/m_string.h:
  OS2 removal
include/my_global.h:
  OS2 removal
include/my_net.h:
  OS2 removal
include/my_no_pthread.h:
  OS2 removal
include/my_pthread.h:
  OS2 removal
include/thr_alarm.h:
  OS2 removal
mysys/default.c:
  OS2 removal
mysys/mf_path.c:
  OS2 removal
mysys/mf_tempdir.c:
  OS2 removal
mysys/mf_tempfile.c:
  OS2 removal
mysys/my_access.c:
  OS2 removal
mysys/my_clock.c:
  OS2 removal
mysys/my_copy.c:
  OS2 removal
mysys/my_create.c:
  OS2 removal
mysys/my_dup.c:
  OS2 removal
mysys/my_file.c:
  OS2 removal
mysys/my_getwd.c:
  OS2 removal
mysys/my_init.c:
  OS2 removal
mysys/my_lib.c:
  OS2 removal
mysys/my_lock.c:
  OS2 removal
mysys/my_mkdir.c:
  OS2 removal
mysys/my_open.c:
  OS2 removal
mysys/my_pthread.c:
  OS2 removal
mysys/my_redel.c:
  OS2 removal
mysys/my_sleep.c:
  OS2 removal
mysys/my_static.c:
  OS2 removal
mysys/my_thr_init.c:
  OS2 removal
mysys/thr_alarm.c:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal

1 files changed, 3 insertions, 24 deletions

diff --git a/include/my_global.h b/include/my_global.h
index 257d721ec95..500481fd6b8 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -254,7 +254,7 @@
 #endif
 #endif
 
-#if defined(THREAD) && !defined(__WIN__) && !defined(OS2)
+#if defined(THREAD) && !defined(__WIN__)
 #ifndef _POSIX_PTHREAD_SEMANTICS
 #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */
 #endif
@@ -459,9 +459,7 @@ extern "C" int madvise(void *addr, size_t len, int behav);
 #define POSIX_MISTAKE 1		/* regexp: Fix stupid spec error */
 #define USE_REGEX 1		/* We want the use the regex library */
 /* Do not define for ultra sparcs */
-#ifndef OS2
 #define USE_BMOVE512 1		/* Use this unless system bmove is faster */
-#endif
 
 #define QUOTE_ARG(x)		#x	/* Quote argument (before cpp) */
 #define STRINGIFY_ARG(x) QUOTE_ARG(x)	/* Quote argument, after cpp */
@@ -506,7 +504,7 @@ int	__void__;
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #endif
 
-#if defined(__EMX__) || !defined(HAVE_UINT)
+#if !defined(HAVE_UINT)
 #undef HAVE_UINT
 #define HAVE_UINT
 typedef unsigned int uint;
@@ -684,14 +682,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define FN_DEVCHAR	':'
 
 #ifndef FN_LIBCHAR
-#ifdef __EMX__
-#define FN_LIBCHAR	'\\'
-#define FN_ROOTDIR	"\\"
-#else
 #define FN_LIBCHAR	'/'
 #define FN_ROOTDIR	"/"
 #endif
-#endif
 #define MY_NFILE	64	/* This is only used to save filenames */
 #ifndef OS_FILE_LIMIT
 #define OS_FILE_LIMIT	65535
@@ -738,11 +731,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
 
 #undef remove		/* Crashes MySQL on SCO 5.0.0 */
 #ifndef __WIN__
-#ifdef OS2
-#define closesocket(A)	soclose(A)
-#else
 #define closesocket(A)	close(A)
-#endif
 #ifndef ulonglong2double
 #define ulonglong2double(A) ((double) (ulonglong) (A))
 #define my_off_t2double(A)  ((double) (my_off_t) (A))
@@ -951,7 +940,7 @@ typedef ulonglong my_off_t;
 typedef unsigned long my_off_t;
 #endif
 #define MY_FILEPOS_ERROR	(~(my_off_t) 0)
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__)
 typedef off_t os_off_t;
 #endif
 
@@ -964,16 +953,6 @@ typedef off_t os_off_t;
 #define SOCKET_EADDRINUSE WSAEADDRINUSE
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
-#elif defined(OS2)
-#define socket_errno	sock_errno()
-#define SOCKET_EINTR	SOCEINTR
-#define SOCKET_EAGAIN	SOCEINPROGRESS
-#define SOCKET_ETIMEDOUT SOCKET_EINTR
-#define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
-#define SOCKET_EADDRINUSE SOCEADDRINUSE
-#define SOCKET_ENFILE	SOCENFILE
-#define SOCKET_EMFILE	SOCEMFILE
-#define closesocket(A)	soclose(A)
 #else /* Unix */
 #define socket_errno	errno
 #define closesocket(A)	close(A)