summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-26 20:11:11 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-26 20:11:11 +0100
commitce7be3a0e6f19bc85990bb8fcfe5e208944777b4 (patch)
tree05f693e575be40068c6ced92e0fd72f8e2e49264
parent2472a74be4dedfeaff22314f31cf9787618163d1 (diff)
patch 8.2.2056: configure fails when building with implicit-function-declarationv8.2.2056
Problem: Configure fails when building with the "implicit-function-declaration" error enabled, specifically on Mac. Solution: Declear the functions like in the source code. (suggestion by Clemens Lang, closes #7380)
-rwxr-xr-xsrc/auto/configure10
-rw-r--r--src/configure.ac10
-rw-r--r--src/version.c2
3 files changed, 20 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 13eaea6f85..d1359485b6 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12350,10 +12350,18 @@ if test -c /dev/ptmx ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
+char *ptsname(int);
+int unlockpt(int);
+int grantpt(int);
+
int
main ()
{
-ptsname(0);grantpt(0);unlockpt(0);
+
+ ptsname(0);
+ grantpt(0);
+ unlockpt(0);
;
return 0;
}
diff --git a/src/configure.ac b/src/configure.ac
index 457f2b82b1..010cc8f09c 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3593,7 +3593,15 @@ fi
AC_MSG_CHECKING(for SVR4 ptys)
if test -c /dev/ptmx ; then
- AC_TRY_LINK([], [ptsname(0);grantpt(0);unlockpt(0);],
+ AC_TRY_LINK([
+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
+char *ptsname(int);
+int unlockpt(int);
+int grantpt(int);
+ ], [
+ ptsname(0);
+ grantpt(0);
+ unlockpt(0);],
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SVR4_PTYS),
AC_MSG_RESULT(no))
else
diff --git a/src/version.c b/src/version.c
index 8c4c3fa665..0308c91209 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2056,
+/**/
2055,
/**/
2054,