patch 8.0.0130

Problem:    Configure uses "ushort" while the Vim code doesn't.
Solution:   Use "unsigned short" instead. (Fredrik Fornwall, closes #1314)

diff --git a/src/auto/configure b/src/auto/configure
index 27aea9c989bf4369cddf7fcd99c816acbf876203..b4745ea80ac6c5905f58a7f8bb0600b52081e243 100755 (executable)
--- 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 3a31f97bf3712c443c70c4e797a59256b04bb922..1706a8d9a4100cfc5ea2a817069692ed1206ebec 100644 (file)
--- 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 452ab18ac6fff3b8a9e1c4c9b47604bc2c275d09..09d26f6520dc7b3d8175244891ffa6578ccc151c 100644 (file)
--- 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,
 /**/