Skip to content

Commit 63de19e

Browse files
committed
patch 8.0.0130
Problem: Configure uses "ushort" while the Vim code doesn't. Solution: Use "unsigned short" instead. (Fredrik Fornwall, closes #1314)
1 parent 0df3c7f commit 63de19e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/auto/configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7411,7 +7411,7 @@ $as_echo_n "checking whether compiling with process communication is possible...
74117411
/* Check bitfields */
74127412
struct nbbuf {
74137413
unsigned int initDone:1;
7414-
ushort signmaplen;
7414+
unsigned short signmaplen;
74157415
};
74167416
74177417
int
@@ -12000,8 +12000,8 @@ if test "x$vim_cv_getcwd_broken" = "xyes" ; then
1200012000

1200112001
fi
1200212002

12003-
for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \
12004-
getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
12003+
for ac_func in fchdir fchown fsync getcwd getpseudotty \
12004+
getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \
1200512005
memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
1200612006
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
1200712007
sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \

src/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,7 @@ if test "$enable_channel" = "yes"; then
19951995
/* Check bitfields */
19961996
struct nbbuf {
19971997
unsigned int initDone:1;
1998-
ushort signmaplen;
1998+
unsigned short signmaplen;
19991999
};
20002000
], [
20012001
/* Check creating a socket. */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
130,
767769
/**/
768770
129,
769771
/**/

0 commit comments

Comments
 (0)