summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>2022-09-25 20:12:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-25 20:12:21 +0100
commitb7e07dc1036b5b02870c72e872bbb248640ade7d (patch)
tree7ab47ffb1e5720849b6438cd5127074605033719
parent4d2073b2610dd6270cc664224dce9524b2a1d758 (diff)
patch 9.0.0589: on AmigaOS4 the pid is available but the task address is usedv9.0.0589
Problem: On AmigaOS4 the pid is available but the task address is used. Solution: Use getpid(). (Ola Söder, closes #11224)
-rw-r--r--src/os_amiga.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os_amiga.c b/src/os_amiga.c
index 0e5c7146b2..25e8956806 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -704,7 +704,9 @@ mch_get_host_name(char_u *s, int len)
long
mch_get_pid(void)
{
-#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__)
+#if defined(__amigaos4__)
+ return (long) getpid();
+#elif defined(__AROS__) || defined(__MORPHOS__)
// This is as close to a pid as we can come. We could use CLI numbers also,
// but then we would have two different types of process identifiers.
return((long)FindTask(0));
diff --git a/src/version.c b/src/version.c
index b0f53ab262..dedb6ccb26 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 589,
+/**/
588,
/**/
587,