From: Bram Moolenaar Date: Wed, 21 Sep 2011 18:09:42 +0000 (+0200) Subject: updated for version 7.3.322 X-Git-Tag: v7.3.322 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f733d1ffda01d633f43e916d4ff422bd77a665a;p=vim updated for version 7.3.322 Problem: #ifdef for PDP_RETVAL doesn't work, INT_PTR can be a typedef. Solution: Check the MSC version and 64 bit flags. (Sergiu Dotenco) --- diff --git a/src/os_mswin.c b/src/os_mswin.c index 49b142895..839c3df5b 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1781,7 +1781,7 @@ swap_me(COLORREF colorref) } /* Attempt to make this work for old and new compilers */ -#if !defined(_MSC_VER) || (_MSC_VER < 1300) || !defined(INT_PTR) +#if !defined(_WIN64) && (!defined(_MSC_VER) || _MSC_VER < 1300) # define PDP_RETVAL BOOL #else # define PDP_RETVAL INT_PTR diff --git a/src/version.c b/src/version.c index 2837018f9..9289490dc 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 322, /**/ 321, /**/