summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>2023-03-06 20:36:55 +0000
committerBram Moolenaar <Bram@vim.org>2023-03-06 20:36:55 +0000
commitf06c4a7a1d6a8a02449e6ed3aa3a2c19d7fde2ea (patch)
tree7f62cde0348aa1b2ff28c9643c2829af0f2ad046
parentcf3c1ca276aa8f9fada7b7cd0197bbb0f91e0950 (diff)
patch 9.0.1388: Amiga: not all builds use gethostname()v9.0.1388
Problem: Amiga: not all builds use gethostname(). Solution: Use gethostname() for all builds except AROS. (Ola Söder, closes #12107)
-rw-r--r--src/os_amiga.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_amiga.c b/src/os_amiga.c
index 0e0fa77834..2d243b72e2 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -691,7 +691,7 @@ mch_get_user_name(char_u *s, int len)
void
mch_get_host_name(char_u *s, int len)
{
-#if defined(__amigaos4__) && defined(__CLIB2__)
+#if !defined(__AROS__)
gethostname(s, len);
#else
vim_strncpy(s, "Amiga", len - 1);
diff --git a/src/version.c b/src/version.c
index e590919f89..0a05883d0c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1388,
+/**/
1387,
/**/
1386,