From 63de19e805a7df2b52ec0e705b6a668ecd8e1b64 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 9 Dec 2016 20:11:26 +0100 Subject: [PATCH] patch 8.0.0130 Problem: Configure uses "ushort" while the Vim code doesn't. Solution: Use "unsigned short" instead. (Fredrik Fornwall, closes #1314) --- src/auto/configure | 6 +++--- src/configure.ac | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index 27aea9c98..b4745ea80 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 3a31f97bf..1706a8d9a 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 452ab18ac..09d26f652 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 */ +/**/ + 130, /**/ 129, /**/ -- 2.50.1