updated for version 7.3.1266

Problem:    QNX: GUI fails to start.
Solution:   Remove the QNX-specific #ifdef. (Sean Boudreau)

diff --git a/src/gui.c b/src/gui.c
index 6b7806c6f6fa24cdcb03d3fbbd3213d9811cabda..06a99e6cba16e822d438ed8395ef095814095883 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -206,12 +206,6 @@ gui_attempt_start()
     static void
 gui_do_fork()
 {
-#ifdef __QNXNTO__
-    procmgr_daemon(0, PROCMGR_DAEMON_KEEPUMASK | PROCMGR_DAEMON_NOCHDIR |
-           PROCMGR_DAEMON_NOCLOSE | PROCMGR_DAEMON_NODEVNULL);
-    gui_attempt_start();
-    return;
-#else
     int                pipefd[2];      /* pipe between parent and child */
     int                pipe_error;
     int                status;
@@ -316,7 +310,6 @@ gui_do_fork()
     /* If we failed to start the GUI, exit now. */
     if (!gui.in_use)
        exit(1);
-#endif
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index 1d85f732637d05a434538f51459ffdc196fcc281..b35ed20af41fb76fb8525b9397bea6d96ca7e194 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1266,
 /**/
     1265,
 /**/