]> granicus.if.org Git - vim/commitdiff
patch 9.0.1389: Amiga: a couple of include files are included twice v9.0.1389
author=?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>
Tue, 7 Mar 2023 15:30:50 +0000 (15:30 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 7 Mar 2023 15:30:50 +0000 (15:30 +0000)
Problem:    Amiga: a couple of include files are included twice.
Solution:   Remove duplicate includes. (Ola Söder, closes #12106)

src/os_amiga.c
src/version.c

index 2d243b72e2d763e90ada2b84673bbd4b7734fada..bc4ecc9610190863fe657c7c38d3d5af1e6c7fff 100644 (file)
 #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>
index 0a05883d0cff8a1b6ce679eb0a07c4373a10bb10..2a5069431bbff703f85166c092f953f62da636d5 100644 (file)
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1389,
 /**/
     1388,
 /**/