diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-29 15:19:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-29 15:19:21 +0200 |
| commit | 6a65151d8649560f359d2d87a08ae64b630b1057 (patch) | |
| tree | 47effa5bb8e7af283b91b9ef52f8579c074a7cd4 | |
| parent | 1e1a4fdd3fd6f4f3aa47f302dbb6c162cb272cc5 (diff) | |
| download | vim-6a65151d8649560f359d2d87a08ae64b630b1057.tar.gz | |
Problem: QNX: GUI fails to start.
Solution: Remove the QNX-specific #ifdef. (Sean Boudreau)
| -rw-r--r-- | src/gui.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 7 deletions
@@ -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 1d85f732..b35ed20a 100644 --- 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, |