Skip to content

Commit dba7c85

Browse files
committed
patch 8.2.0065: Amiga and alikes: autoopen only used on Amiga OS4
Problem: Amiga and alikes: autoopen only used on Amiga OS4. Solution: Adjust #ifdefs. (Ola Söder, closes #5413)
1 parent efcc329 commit dba7c85

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/os_amiga.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ static BPTR raw_in = (BPTR)NULL;
9292
static BPTR raw_out = (BPTR)NULL;
9393
static int close_win = FALSE; // set if Vim opened the window
9494

95-
#ifndef __amigaos4__ // Use autoopen for AmigaOS4
95+
/* Use autoopen for AmigaOS4, AROS and MorphOS */
96+
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
9697
struct IntuitionBase *IntuitionBase = NULL;
9798
#endif
9899
#ifdef FEAT_ARP
@@ -255,7 +256,9 @@ mch_suspend(void)
255256
void
256257
mch_init(void)
257258
{
259+
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
258260
static char intlibname[] = "intuition.library";
261+
#endif
259262

260263
#ifdef AZTEC_C
261264
Enable_Abort = 0; // disallow vim to be aborted
@@ -284,7 +287,7 @@ mch_init(void)
284287
out_flush();
285288

286289
wb_window = NULL;
287-
#ifndef __amigaos4__
290+
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
288291
if ((IntuitionBase = (struct IntuitionBase *)
289292
OpenLibrary((UBYTE *)intlibname, 0L)) == NULL)
290293
{
@@ -329,15 +332,15 @@ mch_check_win(int argc, char **argv)
329332
char *av;
330333
char_u *device = NULL;
331334
int exitval = 4;
332-
#ifndef __amigaos4__
335+
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
333336
struct Library *DosBase;
334337
#endif
335338
int usewin = FALSE;
336339

337340
/*
338341
* check if we are running under DOS 2.0x or higher
339342
*/
340-
#ifndef __amigaos4__
343+
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
341344
DosBase = OpenLibrary(DOS_LIBRARY, 37L);
342345
if (DosBase != NULL)
343346
// if (((struct Library *)DOSBase)->lib_Version >= 37)
@@ -361,7 +364,7 @@ mch_check_win(int argc, char **argv)
361364
}
362365
# endif
363366
}
364-
#endif // __amigaos4__
367+
#endif /* __amigaos4__ __AROS__ __MORPHOS__ */
365368

366369
/*
367370
* scan argv[] for the "-f" and "-d" arguments

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
65,
745747
/**/
746748
64,
747749
/**/

0 commit comments

Comments
 (0)