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, 0 insertions, 10 deletions

diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index 8f915d6003a..919727e03d6 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.c
@@ -26,11 +26,6 @@
 #ifdef __WIN__
 #include <sys/locking.h>
 #endif
-#ifdef __EMX__
-#define INCL_BASE
-#define INCL_NOPMAPI
-#include <os2emx.h>
-#endif
 #ifdef __NETWARE__
 #include <nks/fsio.h>
 #endif
@@ -96,11 +91,6 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
         DBUG_RETURN(0);
     }
   }
-#elif defined(__EMX__) || defined(OS2)
-
-   if (!_lock64( fd, locktype, start, length, MyFlags))
-    DBUG_RETURN(0);
-
 #elif defined(HAVE_LOCKING)
   /* Windows */
   {