diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-04 22:00:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-04 22:00:15 +0200 |
| commit | c90f2aedd0a5dc2cc75bc9b5f475f8a3e3fe36b1 (patch) | |
| tree | da49c3c824709fbb344aa9a841bcacc5346c4719 | |
| parent | 9d5b876d458e242b8b5e44da10c5cdc6bbb7f57c (diff) | |
patch 7.4.2156v7.4.2156
Problem: Compiler warning.
Solution: Add type cast. (Ken Takata, Mike Williams)
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 9fe43218d2..d502634e3e 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -577,7 +577,7 @@ null_libintl_ngettext( const char *msgid_plural, unsigned long n) { - return n == 1 ? msgid : msgid_plural; + return (char *)(n == 1 ? msgid : msgid_plural); } /*ARGSUSED*/ diff --git a/src/version.c b/src/version.c index a4392eb1ea..17febd0562 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2156, +/**/ 2155, /**/ 2154, |