Minor changes for IBM CSet.

#include <direct.h> is not needed anymore
We need #include <io.h> somewhere

edit/editwidget.c

@@ -31,10 +31,6 @@
 #include "mousemark.h"
 #endif
 
-#ifdef __os2__
-#  include <direct.h>
-#endif
-
 #ifndef MIDNIGHT
 
 extern int EditExposeRedraw;

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

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() */

src/hotlist.c

@@ -46,7 +46,6 @@
 #    include <pwd.h>
 #else
 #    include <io.h>
-#    include <direct.h>
 #endif
 #include "tty.h"
 #include "mad.h"

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 ());

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() */

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"
 

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() */

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;
 

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