4 files changed, 8 insertions, 5 deletions
diff --git a/config.h.in b/config.h.in
index 38ee8e9..09283fa 100644
--- a/config.h.in
+++ b/config.h.in
@@ -145,12 +145,15 @@ typedef long clen_t;
 #undef HAVE_LANGINFO_CODESET
 
 #undef SETPGRP_VOID
+#ifdef HAVE_SETPGRP
 #ifdef SETPGRP_VOID
 #define SETPGRP() setpgrp()
 #else
 #define SETPGRP() setpgrp(0,0)
 #endif
-
+#else /* no HAVE_SETPGRP; OS/2 EMX */
+#define SETPGRP() setpgid(0, 0)
+#endif
 #undef HAVE_FLOAT_H
 #undef HAVE_SYS_SELECT_H
 
diff --git a/configure.in b/configure.in
index 70a654d..9277a94 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,7 @@ AC_DEFINE(AUXBIN_TARGETS, "$AUXBIN_TARGETS")
 
 AC_SUBST(USE_BINMODE_STREAM)
 case "$host_os" in
-  *cygwin*)
+  *cygwin*|*os2-emx*)
     AC_DEFINE(USE_BINMODE_STREAM)
     ;;
 esac
diff --git a/islang.c b/islang.c
index bcf9688..2d0c164 100644
--- a/islang.c
+++ b/islang.c
@@ -18,7 +18,7 @@ main(int argc, char **argv)
 	return 1;
 
     if (isdigit((int)*argv[1])) {
-	ULONG CpList[8], CpSize;
+	unsigned long CpList[8], CpSize;
 	APIRET rc = DosQueryCp(sizeof(CpList), CpList, &CpSize);
 	if (rc)
 	    return rc;
diff --git a/main.c b/main.c
index ced3d5f..24201a9 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.246 2004/09/29 15:44:03 ukai Exp $ */
+/* $Id: main.c,v 1.247 2005/02/26 17:06:44 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -5673,7 +5673,7 @@ searchKeyNum(void)
 static char *
 getCodePage(void)
 {
-    ULONG CpList[8], CpSize;
+    unsigned long CpList[8], CpSize;
 
     if (!getenv("WINDOWID") && !DosQueryCp(sizeof(CpList), CpList, &CpSize))
 	return Sprintf("CP%d", *CpList)->ptr;