aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0065: Amiga and alikes: autoopen only used on Amiga OS4

Browse Source 
Problem:    Amiga and alikes: autoopen only used on Amiga OS4.
Solution:   Adjust #ifdefs. (Ola Söder, closes #5413)
This commit is contained in:
Bram Moolenaar 2019-12-30 22:33:17 +01:00
parent efcc329020
commit dba7c85b61
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os_amiga.c
View File

@ -92,7 +92,8 @@ static BPTR raw_in = (BPTR)NULL;
static BPTR raw_out = (BPTR)NULL; static BPTR raw_out = (BPTR)NULL;
static int close_win = FALSE; // set if Vim opened the window static int close_win = FALSE; // set if Vim opened the window
#ifndef __amigaos4__ // Use autoopen for AmigaOS4 /* Use autoopen for AmigaOS4, AROS and MorphOS */
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
struct IntuitionBase *IntuitionBase = NULL; struct IntuitionBase *IntuitionBase = NULL;
#endif #endif
#ifdef FEAT_ARP #ifdef FEAT_ARP
@ -255,7 +256,9 @@ mch_suspend(void)
void void
mch_init(void) mch_init(void)
{ {
#if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
static char intlibname[] = "intuition.library"; static char intlibname[] = "intuition.library";
#endif
#ifdef AZTEC_C #ifdef AZTEC_C
Enable_Abort = 0; // disallow vim to be aborted Enable_Abort = 0; // disallow vim to be aborted
@ -284,7 +287,7 @@ mch_init(void)
out_flush(); out_flush();
wb_window = NULL; wb_window = NULL;
#ifndef __amigaos4__ #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
if ((IntuitionBase = (struct IntuitionBase *) if ((IntuitionBase = (struct IntuitionBase *)
OpenLibrary((UBYTE *)intlibname, 0L)) == NULL) OpenLibrary((UBYTE *)intlibname, 0L)) == NULL)
{ {
@ -329,7 +332,7 @@ mch_check_win(int argc, char **argv)
char *av; char *av;
char_u *device = NULL; char_u *device = NULL;
int exitval = 4; int exitval = 4;
#ifndef __amigaos4__ #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
struct Library *DosBase; struct Library *DosBase;
#endif #endif
int usewin = FALSE; int usewin = FALSE;
@ -337,7 +340,7 @@ mch_check_win(int argc, char **argv)
/* /*
* check if we are running under DOS 2.0x or higher * check if we are running under DOS 2.0x or higher
*/ */
#ifndef __amigaos4__ #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
DosBase = OpenLibrary(DOS_LIBRARY, 37L); DosBase = OpenLibrary(DOS_LIBRARY, 37L);
if (DosBase != NULL) if (DosBase != NULL)
// if (((struct Library *)DOSBase)->lib_Version >= 37) // if (((struct Library *)DOSBase)->lib_Version >= 37)
@ -361,7 +364,7 @@ mch_check_win(int argc, char **argv)
} }
# endif # endif
} }
#endif // __amigaos4__ #endif /* __amigaos4__ __AROS__ __MORPHOS__ */
/* /*
* scan argv[] for the "-f" and "-d" arguments * scan argv[] for the "-f" and "-d" arguments

2
src/version.c
View File

@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
65,
/**/ /**/
64, 64,
/**/ /**/