diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-09 20:11:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-09 20:11:26 +0100 |
| commit | 63de19e805a7df2b52ec0e705b6a668ecd8e1b64 (patch) | |
| tree | 8f56577dd108652bbfa4314719f23621925717d2 | |
| parent | 0df3c7f2a05c2a99f2fb2747ae46bd6594052997 (diff) | |
patch 8.0.0130v8.0.0130
Problem: Configure uses "ushort" while the Vim code doesn't.
Solution: Use "unsigned short" instead. (Fredrik Fornwall, closes #1314)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index 27aea9c989..b4745ea80a 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7411,7 +7411,7 @@ $as_echo_n "checking whether compiling with process communication is possible... /* Check bitfields */ struct nbbuf { unsigned int initDone:1; - ushort signmaplen; + unsigned short signmaplen; }; int @@ -12000,8 +12000,8 @@ if test "x$vim_cv_getcwd_broken" = "xyes" ; then fi -for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \ - getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \ +for ac_func in fchdir fchown fsync getcwd getpseudotty \ + getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \ memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \ setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \ sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \ diff --git a/src/configure.ac b/src/configure.ac index 3a31f97bf3..1706a8d9a4 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1995,7 +1995,7 @@ if test "$enable_channel" = "yes"; then /* Check bitfields */ struct nbbuf { unsigned int initDone:1; - ushort signmaplen; + unsigned short signmaplen; }; ], [ /* Check creating a socket. */ diff --git a/src/version.c b/src/version.c index 452ab18ac6..09d26f6520 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 130, +/**/ 129, /**/ 128, |