summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-06-20 00:53:15 +0200
committerBram Moolenaar <bram@vim.org>2011-06-20 00:53:15 +0200
commit72762cd6a145a61a33a59c785c5c56405b101cdc (patch)
treef86a6b8785169fbc174fcf923be7342d918356c4
parent05b924cb1d7e11d03c17b1f4953eedcdf5e9e4a1 (diff)
downloadvim-72762cd6a145a61a33a59c785c5c56405b101cdc.tar.gz
updated for version 7.3.229v7.3.229v7-3-229
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.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui.c b/src/gui.c
index 4255607a..244dbd54 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -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,