# HG changeset patch # User Bram Moolenaar # Date 1372511961 -7200 # Node ID bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb # Parent 1b455771dad6a83abfd8b524b936404c80f8e722 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1266, +/**/ 1265, /**/ 1264,