From 2b7cf88d85e94502c26bbc2008a5b63a065b056e Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 18 Feb 2002 21:54:27 +0000
Subject: [PATCH] * global.h: Include unix.h under "classical" QNX. *
 subshell.c: Don't include unix.h. * utilunix.c: Likewise.

---
 src/ChangeLog  | 6 ++++++
 src/global.h   | 5 +++++
 src/subshell.c | 4 ----
 src/utilunix.c | 3 ---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 7409898ff..8967d0a89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-18  Pavel Roskin  <proski@gnu.org>
+
+	* global.h: Include unix.h under "classical" QNX.
+	* subshell.c: Don't include unix.h.
+	* utilunix.c: Likewise.
+
 2002-02-07  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* main.c (update_one_panel_widget): Call ftpfs_flushdir().
diff --git a/src/global.h b/src/global.h
index cc0b07062..6adc1fe33 100644
--- a/src/global.h
+++ b/src/global.h
@@ -64,6 +64,11 @@ struct timeval {
 #  include <pwd.h>
 #endif
 
+#if defined(__QNX__) && !defined(__QNXNTO__)
+/* exec*() from <process.h> */
+#  include <unix.h>
+#endif
+
 #include <glib.h>
 
 #ifndef __GNUC__
diff --git a/src/subshell.c b/src/subshell.c
index 35b0010d5..17fa218b7 100644
--- a/src/subshell.c
+++ b/src/subshell.c
@@ -49,10 +49,6 @@
 #   include <stropts.h> /* For I_PUSH */
 #endif /* HAVE_STROPTS_H */
 
-#ifdef __QNX__
-#   include <unix.h>	/* exec*() from <process.h> */
-#endif
-
 #include "global.h"	/* For home_dir			      */
 #include "tty.h"
 #include "dir.h"	/* Required by panel.h below	      */
diff --git a/src/utilunix.c b/src/utilunix.c
index e9346aea1..3d870512b 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -38,9 +38,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>
 #endif
-#ifdef __QNX__
-#   include <unix.h>		/* exec*() from <process.h> */
-#endif
 
 #include "global.h"
 #include "fsusage.h"