diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-09-21 20:09:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-09-21 20:09:42 +0200 |
| commit | 9f733d1ffda01d633f43e916d4ff422bd77a665a (patch) | |
| tree | 86a63e6e74fdd30d6a879c3f1be5f394ab279067 | |
| parent | 447038a1273f3c4d00616da8334e77915a22f163 (diff) | |
| download | vim-git-7.3.322.tar.gz | |
updated for version 7.3.322v7.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)
| -rw-r--r-- | src/os_mswin.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 322, +/**/ 321, /**/ 320, |