diff options
author | Bram Moolenaar <bram@vim.org> | 2011-06-20 00:53:15 +0200 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2011-06-20 00:53:15 +0200 |
commit | 72762cd6a145a61a33a59c785c5c56405b101cdc (patch) | |
tree | f86a6b8785169fbc174fcf923be7342d918356c4 | |
parent | 05b924cb1d7e11d03c17b1f4953eedcdf5e9e4a1 (diff) | |
download | vim-72762cd6a145a61a33a59c785c5c56405b101cdc.tar.gz |
Problem: Using fork() makes gvim crash on Mac when build with
CoreFoundation.
Solution: Disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka)
-rw-r--r-- | src/gui.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -59,7 +59,8 @@ static int can_update_cursor = TRUE; /* can display the cursor */ gui_start() { char_u *old_term; -#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) +#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) \ + && !defined(__APPLE__) # define MAY_FORK int dofork = TRUE; #endif diff --git a/src/version.c b/src/version.c index 81ab3f7a..70212218 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 229, +/**/ 228, /**/ 227, |