summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>2023-03-07 15:30:50 +0000
committerBram Moolenaar <Bram@vim.org>2023-03-07 15:30:50 +0000
commit663ee88a8260d69d9310e22f2bfdec49af6a102e (patch)
tree8f032e2153063137da4fc74359182dd8ceafb26e
parentf06c4a7a1d6a8a02449e6ed3aa3a2c19d7fde2ea (diff)
patch 9.0.1389: Amiga: a couple of include files are included twicev9.0.1389
Problem: Amiga: a couple of include files are included twice. Solution: Remove duplicate includes. (Ola Söder, closes #12106)
-rw-r--r--src/os_amiga.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/os_amiga.c b/src/os_amiga.c
index 2d243b72e2..bc4ecc9610 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -27,19 +27,19 @@
#ifndef PROTO
#ifndef LATTICE
-# include <exec/types.h>
# include <exec/exec.h>
-# include <libraries/dos.h>
# include <intuition/intuition.h>
#endif
// XXX These are included from os_amiga.h
+// #include <exec/types.h>
+// #include <libraries/dos.h>
+// #include <libraries/dosextens.h>
// #include <proto/exec.h>
// #include <proto/dos.h>
// #include <proto/intuition.h>
#include <exec/memory.h>
-#include <libraries/dosextens.h>
#include <dos/dostags.h> // for 2.0 functions
#include <dos/dosasl.h>
diff --git a/src/version.c b/src/version.c
index 0a05883d0c..2a5069431b 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 */
/**/
+ 1389,
+/**/
1388,
/**/
1387,