Mercurial > vim

changeset 32116:2af88d8f87ab v9.0.1389

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1389: Amiga: a couple of include files are included twice Commit: https://github.com/vim/vim/commit/663ee88a8260d69d9310e22f2bfdec49af6a102e Author: =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com> Date: Tue Mar 7 15:30:50 2023 +0000 patch 9.0.1389: Amiga: a couple of include files are included twice Problem: Amiga: a couple of include files are included twice. Solution: Remove duplicate includes. (Ola S?der, closes https://github.com/vim/vim/issues/12106)
author Bram Moolenaar <Bram@vim.org>
date Tue, 07 Mar 2023 16:45:04 +0100
parents c45ce1e9a0db
children 0741cc777264
files src/os_amiga.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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,