OS2 now uses property defines instead of OS2_NT

acconfig.h

@@ -225,6 +225,19 @@
 #ifdef __os2__
 #    define OS2_NT 1
 #    define S_ISFIFO(x) 0
+
+#    define NEEDS_IO_H
+#    define NEEDS_DRIVE_H
+#    define NEEDS_FCNTL_H
+#    define HAS_NO_GRP_PWD_H
+#    define HAS_NO_TERMIOS_H
+#    define HAS_NO_SYS_PARAM_H
+#    define HAS_NO_SYS_IOCTL_H
+
+#    define USE_O_TEXT
+#    define HAS_ACS_AS_PCCHARS
+#    define HAS_DIRECT_COLOR_ACCESS
+#    define NEEDS_CR_LF_TRANSLATION
 #endif
 
 #ifdef _OS_NT

gtkedit/edit.c

@@ -21,9 +21,11 @@
 #define _EDIT_C THIS_IS
 
 #include <config.h>
-#if defined(OS2_NT)
+#if defined(NEEDS_IO_H)
 #    include <io.h>
-#    include <fcntl.h>
+#endif
+#include <fcntl.h>
+#ifdef NEEDS_CR_LF_TRANSLATION
 #    define CR_LF_TRANSLATION
 #endif
 #include "edit.h"

gtkedit/edit.h

@@ -562,7 +562,7 @@ void edit_get_syntax_color (WEdit * edit, long byte_index, int *fg, int *bg);
 
 /* put OS2/NT/WIN95 defines here */
 
-#    ifdef OS2_NT
+#    ifdef USE_O_TEXT
 #    	 define MY_O_TEXT O_TEXT
 #    else
 #    	 define MY_O_TEXT 0

gtkedit/editcmd.c

@@ -21,7 +21,7 @@
 /* #define PIPE_BLOCKS_SO_READ_BYTE_BY_BYTE */
 
 #include <config.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #include <io.h>
 #include <fcntl.h>
 #endif

pc/config.h

@@ -34,6 +34,19 @@
 
 #define OS2_NT
 
+#define NEEDS_IO_H
+#define NEEDS_DRIVE_H
+#define NEEDS_FCNTL_H
+#define HAS_NO_GRP_PWD_H
+#define HAS_NO_TERMIOS_H
+#define HAS_NO_SYS_PARAM_H
+#define HAS_NO_SYS_IOCTL_H
+
+#define USE_O_TEXT
+#define HAS_ACS_AS_PCCHARS
+#define HAS_DIRECT_COLOR_ACCESS
+#define NEEDS_CR_LF_TRANSLATION
+
 #ifdef MC_NT
 #  ifndef WIN32
 #    define WIN32
@@ -55,6 +68,7 @@
 #  endif
 #  ifndef __os2__
 #    define __os2__
+#    define NEEDS_LOCAL_DIRENT_H
 #  endif
 #endif /* MC_OS2 */
 
@@ -81,7 +95,6 @@
 #define HAVE_STRING_H
 #define HAVE_DIRENT_H
 #define HAVE_LIMITS_H
-#define HAVE_FCNTL_H
 #define HAVE_UTIME_H
 
 #define HAVE_MEMSET

slang/slang.h

@@ -62,6 +62,7 @@
 # endif
 # ifndef __os2__
 #   define __os2__
+#   define NEEDS_LOCAL_DIRENT_H
 # endif
 #endif
 

src/cmd.c

@@ -39,7 +39,7 @@
 #include <fcntl.h>		/* open, O_RDWR */
 #include <errno.h>
 
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
 

src/color.c

@@ -294,7 +294,7 @@ void init_colors (void)
 	}
 #endif
 
-#if defined HAVE_SLANG && !defined(OS2_NT)
+#if defined HAVE_SLANG && !defined(HAS_DIRECT_COLOR_ACCESS)
 	if (use_colors) { /* Hack to make COLOR_PAIR(DEFAULT_COLOR_INDEX) 
                              be the default fg/bg of the terminal */
 	    char *Norm_Vid = SLtt_tgetstr ("me");

src/complete.c

@@ -31,7 +31,7 @@
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
 #if defined(HAVE_DIRENT_H) || defined(_POSIX_VERSION)
-# ifdef __os2__
+# ifdef NEEDS_LOCAL_DIRENT_H
 #   include "dirent.h"
 # else
 #   include <dirent.h>
@@ -55,7 +55,7 @@
 #endif /* not (HAVE_DIRENT_H or _POSIX_VERSION) */
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <pwd.h>
 #endif
 

src/ext.c

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#ifdef __os2__
+#ifdef NEEDS_IO_H
 # include <io.h>
 #endif
 

src/file.c

@@ -61,7 +61,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif 
 

src/filegui.c

@@ -63,7 +63,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif 
 

src/find.c

@@ -22,7 +22,7 @@
 #include "tty.h"
 #include <string.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "fs.h"

src/fs.h

@@ -6,7 +6,7 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifndef OS2_NT
+#ifndef HAS_NO_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include <sys/stat.h>
@@ -19,7 +19,7 @@
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
 #if defined(HAVE_DIRENT_H) || defined(_POSIX_VERSION)
-# ifdef __os2__
+# ifdef NEEDS_LOCAL_DIRENT_H
 #   include "dirent.h"
 # else
 #   include <dirent.h>

src/help.c

@@ -96,7 +96,7 @@ static int inside_link_area = 0;
 
 static int help_callback (struct Dlg_head *h, int id, int msg);
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 struct {
     int acscode;
     int pccode;

src/hotlist.c

@@ -41,10 +41,11 @@
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #    include <grp.h>
 #    include <pwd.h>
-#else
+#endif
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "tty.h"

src/layout.c

@@ -27,12 +27,14 @@
 #include <sys/param.h>		/* Required by tree.h */
 #include <sys/types.h>
 #include <sys/stat.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
+#endif
      /*
       * If TIOCGWINSZ supported, make it available here, because window-
       * resizing code depends on it...
       */
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_SYS_IOCTL_H)
 #	include <sys/ioctl.h>
 #endif
 #ifdef HAVE_UNISTD_H
@@ -583,7 +585,7 @@ void init_curses ()
     extern int force_ugly_line_drawing;
     extern int SLtt_Has_Alt_Charset;
     SLtt_get_terminfo ();
-#ifndef OS2_NT
+#ifndef HAS_ACS_AS_PCCHARS
     if (force_ugly_line_drawing)
 	SLtt_Has_Alt_Charset = 0;
 #endif

src/main.c

@@ -72,7 +72,7 @@
 #endif
 
 #include <errno.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #    include <pwd.h>
 #endif
 #include <ctype.h>
@@ -128,8 +128,10 @@
 #include "chmod.h"
 #include "chown.h"
 
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
+#endif
+#ifdef NEEDS_DRIVE_H
 #    include <drive.h>
 #endif
 

src/mouse.c

@@ -27,7 +27,7 @@
 #endif
 #include <signal.h>	/* For kill() and SIGQUIT */
 #include <fcntl.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
 #endif
 #include <malloc.h>

src/myslang.h

@@ -16,7 +16,7 @@
 #define ACS_URCORNER SLSMG_URCORN_CHAR
 #define ACS_LRCORNER SLSMG_LRCORN_CHAR
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 #    define ACS_LTEE 0xC3
 #    define acs()   ;
 #    define noacs() ;
@@ -121,7 +121,7 @@ void init_pair (int, char *, char *);
 
 #define SLsmg_draw_double_box(r,c,dr,dc) SLsmg_draw_box ((r), (c), (dr), (dc))
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 #   define one_vline() addch(ACS_VLINE)
 #   define one_hline() addch(ACS_HLINE)
     /* This is fast, but unusefull if ! pc_system - doesn't use

src/panelize.c

@@ -33,7 +33,7 @@
 #ifdef HAVE_SYS_WAIT_H
 #   include <sys/wait.h>
 #endif
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <grp.h>
 #   include <pwd.h>
 #endif

src/screen.c

@@ -54,7 +54,7 @@
 #include "../vfs/extfs.h"
 #include <glib.h>
 
-#if defined(OS2_NT)
+#ifdef NEEDS_DRIVE_H
 # include "drive.h"
 #endif
 

src/user.c

@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "tty.h"

src/util.c

@@ -46,7 +46,7 @@
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <pwd.h>
 #   include <grp.h>
 #endif

src/view.c

@@ -29,7 +29,7 @@
 #include "tty.h"
 #include "x.h"
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
 #include <sys/types.h>

src/win.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>	/* For free() */
 #include <string.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
 #endif
 #include "mad.h"

vfs/vfs.h

@@ -2,6 +2,7 @@
 #define __VFS_H
 
 #include <config.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>