diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-05-13 11:09:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-05-13 11:09:22 +0000 |
| commit | 223b4313c860b0ddeadc8166f11b325b66073cc8 (patch) | |
| tree | c2e1d2f07e34d7b70d674675ae0a4a27bc2ef90c | |
| parent | 70fc52750a1287b32873e60a9c916ad4618b5b0b (diff) | |
updated for version 7.0-007v7.0.007
| -rw-r--r-- | src/message.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/message.c b/src/message.c index aebf01bb81..8f0a9c6320 100644 --- a/src/message.c +++ b/src/message.c @@ -4175,15 +4175,16 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) str_arg_l = 0; else { - /* memchr on HP does not like n > 2^31 !!! */ - char *q = memchr(str_arg, '\0', + /* Don't put the #if inside memchr(), it can be a + * macro. */ #if SIZEOF_INT <= 2 - precision + char *q = memchr(str_arg, '\0', precision); #else - precision <= (size_t)0x7fffffffL ? precision - : (size_t)0x7fffffffL + /* memchr on HP does not like n > 2^31 !!! */ + char *q = memchr(str_arg, '\0', + precision <= (size_t)0x7fffffffL ? precision + : (size_t)0x7fffffffL); #endif - ); str_arg_l = (q == NULL) ? precision : q - str_arg; } break; diff --git a/src/version.c b/src/version.c index e0503ca2f5..17b8181c7a 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 7, +/**/ 6, /**/ 5, |