]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.322.patch0
vim: Import latest patches from upstream.
[ipfire-3.x.git] / vim / patches / vim-7.3.322.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.322
3 Fcc: outbox
4 From: Bram Moolenaar <Bram@moolenaar.net>
5 Mime-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8 ------------
9
10 Patch 7.3.322
11 Problem: #ifdef for PDP_RETVAL doesn't work, INT_PTR can be a typedef.
12 Solution: Check the MSC version and 64 bit flags. (Sergiu Dotenco)
13 Files: src/os_mswin.c
14
15
16 *** ../vim-7.3.321/src/os_mswin.c 2011-08-10 17:07:56.000000000 +0200
17 --- src/os_mswin.c 2011-09-21 20:09:05.000000000 +0200
18 ***************
19 *** 1781,1787 ****
20 }
21
22 /* Attempt to make this work for old and new compilers */
23 ! #if !defined(_MSC_VER) || (_MSC_VER < 1300) || !defined(INT_PTR)
24 # define PDP_RETVAL BOOL
25 #else
26 # define PDP_RETVAL INT_PTR
27 --- 1781,1787 ----
28 }
29
30 /* Attempt to make this work for old and new compilers */
31 ! #if !defined(_WIN64) && (!defined(_MSC_VER) || _MSC_VER < 1300)
32 # define PDP_RETVAL BOOL
33 #else
34 # define PDP_RETVAL INT_PTR
35 *** ../vim-7.3.321/src/version.c 2011-09-21 19:50:00.000000000 +0200
36 --- src/version.c 2011-09-21 20:08:29.000000000 +0200
37 ***************
38 *** 711,712 ****
39 --- 711,714 ----
40 { /* Add new patch number below this line */
41 + /**/
42 + 322,
43 /**/
44
45 --
46 Don't Panic!
47 -- The Hitchhiker's Guide to the Galaxy
48
49 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
50 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
51 \\\ an exciting new programming language -- http://www.Zimbu.org ///
52 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///