From 303cd55bceb6f40a8c09efb8e6a92c8a1ba77d32 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@suse.cz>
Date: Sun, 29 Mar 1998 22:23:24 +0000
Subject: [PATCH] Minor changes for IBM CSet. #include <direct.h> is not needed
 anymore We need #include <io.h> somewhere

---
 edit/editwidget.c | 4 ----
 src/cmd.c         | 4 ++++
 src/find.c        | 3 +--
 src/hotlist.c     | 1 -
 src/main.c        | 8 ++------
 src/panelize.c    | 3 ---
 src/popt.c        | 3 +++
 src/screen.c      | 3 ---
 src/tree.c        | 6 +++---
 src/view.c        | 4 ++--
 10 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/edit/editwidget.c b/edit/editwidget.c
index 6a0b3537b..96a268017 100644
--- a/edit/editwidget.c
+++ b/edit/editwidget.c
@@ -31,10 +31,6 @@
 #include "mousemark.h"
 #endif
 
-#ifdef __os2__
-#  include <direct.h>
-#endif
-
 #ifndef MIDNIGHT
 
 extern int EditExposeRedraw;
diff --git a/src/cmd.c b/src/cmd.c
index b9cc6a41e..5b7da4263 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -39,6 +39,10 @@
 #include <fcntl.h>		/* open, O_RDWR */
 #include <errno.h>
 
+#ifdef OS2_NT
+#   include <io.h>
+#endif
+
 #ifdef USE_NETCODE
 #include <netdb.h>
 #endif
diff --git a/src/find.c b/src/find.c
index eee32a946..5cca8d274 100644
--- a/src/find.c
+++ b/src/find.c
@@ -22,9 +22,8 @@
 #include "tty.h"
 #include <string.h>
 #include <stdio.h>
-#ifdef __os2__
+#ifdef OS2_NT
 #    include <io.h>
-#    include <direct.h>
 #endif
 #include "fs.h"
 #include <malloc.h>	/* For free() */
diff --git a/src/hotlist.c b/src/hotlist.c
index 2addf2cec..f7bd0fb1a 100644
--- a/src/hotlist.c
+++ b/src/hotlist.c
@@ -46,7 +46,6 @@
 #    include <pwd.h>
 #else
 #    include <io.h>
-#    include <direct.h>
 #endif
 #include "tty.h"
 #include "mad.h"
diff --git a/src/main.c b/src/main.c
index 1f8769445..a5657f944 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,8 +31,6 @@
 #    define INCL_DOSFILEMGR
 #    define INCL_DOSERRORS
 #    include <os2.h>
-#    include <io.h>
-#    include <direct.h>
 #endif
 
 #include "tty.h"
@@ -126,6 +124,7 @@
 #include "chown.h"
 
 #ifdef OS2_NT
+#    include <io.h>
 #    include <drive.h>
 #endif
 
@@ -2702,10 +2701,7 @@ compatibility_move_mc_files (void)
 
 int main (int argc, char *argv [])
 {
-#ifdef OS2_NT
-    char *drv;
-    char *drv_path;
-#else
+#ifndef OS2_NT
     /* Backward compatibility: Gives up privileges in case someone
        installed the mc as setuid */
     setuid (getuid ());
diff --git a/src/panelize.c b/src/panelize.c
index 7b3f1aba7..3c2fe6dce 100644
--- a/src/panelize.c
+++ b/src/panelize.c
@@ -23,9 +23,6 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifdef __os2__
-#   include <direct.h>
-#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>		/* For malloc() */
diff --git a/src/popt.c b/src/popt.c
index 65eec55db..edffee1d8 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -20,6 +20,9 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
+#ifdef OS2_NT
+#    include <io.h>
+#endif
 
 #include "popt.h"
 
diff --git a/src/screen.c b/src/screen.c
index 6c170f415..c22cc7e24 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -21,9 +21,6 @@
 #include <config.h>
 #include "tty.h"
 #include "fs.h"
-#ifdef __os2__
-#    include <direct.h>
-#endif
 #include <sys/param.h>
 #include <string.h>
 #include <stdlib.h>	/* For malloc() and free() */
diff --git a/src/tree.c b/src/tree.c
index 079fc5644..f5fc482ba 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -27,9 +27,6 @@
 
    */
 #include <config.h>
-#ifdef __os2__
-#    include <direct.h>
-#endif
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -60,6 +57,9 @@
 #include "tree.h"
 #include "cmd.h"
 #include "../vfs/vfs.h"
+#ifdef OS2_NT
+#   include <io.h>
+#endif
 
 extern int command_prompt;
 
diff --git a/src/view.c b/src/view.c
index b1ab7a91f..9a1bcf6a6 100644
--- a/src/view.c
+++ b/src/view.c
@@ -27,8 +27,8 @@
 #include <config.h>
 #include "x.h"
 #include <stdio.h>
-#ifdef __os2__
-#    include <io.h>
+#ifdef OS2_NT
+#   include <io.h>
 #endif
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H