From 04cd479140cd3cbe52297440b856b97b65a34a55 Mon Sep 17 00:00:00 2001
From: unknown <brian@zim.(none)>
Date: Sat, 15 Apr 2006 08:49:00 -0700
Subject: 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
---
 mysys/default.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'mysys/default.c')

diff --git a/mysys/default.c b/mysys/default.c
index 90f8dc5f689..580bcc19eca 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -601,7 +601,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
     strmov(name,config_file);
   }
   fn_format(name,name,"","",4);
-#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(__WIN__) && !defined(__NETWARE__)
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))
@@ -1001,10 +1001,6 @@ static void init_default_directories()
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";
 #else
-#if defined(__EMX__) || defined(OS2)
-  if ((env= getenv("ETC")))
-    *ptr++= env;
-#endif
   *ptr++= "/etc/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-- 
cgit v1.2.1