]>
Commit | Line | Data |
---|---|---|
5ee5dc07 AM |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.0.007 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.0.007 | |
11 | Problem: AIX: compiling fails for message.c. (Ruediger Hornig) | |
12 | Solution: Move the #if outside of memchr(). | |
13 | Files: src/message.c | |
14 | ||
15 | ||
16 | *** ../vim-7.0.006/src/message.c Wed May 10 15:22:50 2006 | |
17 | --- src/message.c Tue May 9 10:36:56 2006 | |
18 | *************** | |
19 | *** 4175,4189 **** | |
20 | str_arg_l = 0; | |
21 | else | |
22 | { | |
23 | ! /* memchr on HP does not like n > 2^31 !!! */ | |
24 | ! char *q = memchr(str_arg, '\0', | |
25 | #if SIZEOF_INT <= 2 | |
26 | ! precision | |
27 | #else | |
28 | ! precision <= (size_t)0x7fffffffL ? precision | |
29 | ! : (size_t)0x7fffffffL | |
30 | #endif | |
31 | - ); | |
32 | str_arg_l = (q == NULL) ? precision : q - str_arg; | |
33 | } | |
34 | break; | |
35 | --- 4175,4190 ---- | |
36 | str_arg_l = 0; | |
37 | else | |
38 | { | |
39 | ! /* Don't put the #if inside memchr(), it can be a | |
40 | ! * macro. */ | |
41 | #if SIZEOF_INT <= 2 | |
42 | ! char *q = memchr(str_arg, '\0', precision); | |
43 | #else | |
44 | ! /* memchr on HP does not like n > 2^31 !!! */ | |
45 | ! char *q = memchr(str_arg, '\0', | |
46 | ! precision <= (size_t)0x7fffffffL ? precision | |
47 | ! : (size_t)0x7fffffffL); | |
48 | #endif | |
49 | str_arg_l = (q == NULL) ? precision : q - str_arg; | |
50 | } | |
51 | break; | |
52 | *** ../vim-7.0.006/src/version.c Wed May 10 17:26:37 2006 | |
53 | --- src/version.c Wed May 10 17:36:03 2006 | |
54 | *************** | |
55 | *** 668,669 **** | |
56 | --- 668,671 ---- | |
57 | { /* Add new patch number below this line */ | |
58 | + /**/ | |
59 | + 7, | |
60 | /**/ | |
61 | ||
62 | -- | |
63 | Momento mori, ergo carpe diem | |
64 | ||
65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
66 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
67 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
68 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |