To: vim_dev@googlegroups.com
Subject: Patch 9.0.1389
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1389
Problem:    Amiga: a couple of include files are included twice.
Solution:   Remove duplicate includes. (Ola Söder, closes #12106)
Files:      src/os_amiga.c


*** ../vim-9.0.1388/src/os_amiga.c	2023-03-06 20:36:51.239293014 +0000
--- src/os_amiga.c	2023-03-07 15:29:42.781556836 +0000
***************
*** 27,45 ****
  #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 <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>
--- 27,45 ----
  #ifndef PROTO
  
  #ifndef LATTICE
  # include <exec/exec.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 <dos/dostags.h>	    // for 2.0 functions
  #include <dos/dosasl.h>
*** ../vim-9.0.1388/src/version.c	2023-03-06 20:36:51.239293014 +0000
--- src/version.c	2023-03-07 15:28:20.481581177 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1389,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
242. You turn down a better-paying job because it doesn't come with
     a free e-mail account.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///