Mirror of the Vim source from https://github.com/vim/vim
修訂 | 48775ea99f249b75872e9f0268c5bda8cb8af8da (tree) |
---|---|
時間 | 2006-05-13 20:09:22 |
作者 | vimboss |
Commiter | vimboss |
updated for version 7.0-007
@@ -4175,15 +4175,16 @@ | ||
4175 | 4175 | str_arg_l = 0; |
4176 | 4176 | else |
4177 | 4177 | { |
4178 | + /* Don't put the #if inside memchr(), it can be a | |
4179 | + * macro. */ | |
4180 | +#if SIZEOF_INT <= 2 | |
4181 | + char *q = memchr(str_arg, '\0', precision); | |
4182 | +#else | |
4178 | 4183 | /* memchr on HP does not like n > 2^31 !!! */ |
4179 | 4184 | char *q = memchr(str_arg, '\0', |
4180 | -#if SIZEOF_INT <= 2 | |
4181 | - precision | |
4182 | -#else | |
4183 | - precision <= (size_t)0x7fffffffL ? precision | |
4184 | - : (size_t)0x7fffffffL | |
4185 | + precision <= (size_t)0x7fffffffL ? precision | |
4186 | + : (size_t)0x7fffffffL); | |
4185 | 4187 | #endif |
4186 | - ); | |
4187 | 4188 | str_arg_l = (q == NULL) ? precision : q - str_arg; |
4188 | 4189 | } |
4189 | 4190 | break; |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 7, | |
671 | +/**/ | |
670 | 672 | 6, |
671 | 673 | /**/ |
672 | 674 | 5, |