Mercurial > vim

comparison src/os_amiga.c @ 19009:43713a77baaf v8.2.0065

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0065: Amiga and alikes: autoopen only used on Amiga OS4 Commit: https://github.com/vim/vim/commit/dba7c85b611ca3bbd054e162f55fcfc3361f0868 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 30 22:33:17 2019 +0100 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 https://github.com/vim/vim/issues/5413)
author Bram Moolenaar <Bram@vim.org>
date Mon, 30 Dec 2019 22:45:04 +0100
parents 44b855153d8e
children 1fe99999625c
comparison
equal deleted inserted replaced
19008:9dd74f906a75 19009:43713a77baaf
90 90
91 static BPTR raw_in = (BPTR)NULL; 91 static BPTR raw_in = (BPTR)NULL;
92 static BPTR raw_out = (BPTR)NULL; 92 static BPTR raw_out = (BPTR)NULL;
93 static int close_win = FALSE; // set if Vim opened the window 93 static int close_win = FALSE; // set if Vim opened the window
94 94
95 #ifndef __amigaos4__ // Use autoopen for AmigaOS4 95 /* Use autoopen for AmigaOS4, AROS and MorphOS */
96 #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
96 struct IntuitionBase *IntuitionBase = NULL; 97 struct IntuitionBase *IntuitionBase = NULL;
97 #endif 98 #endif
98 #ifdef FEAT_ARP 99 #ifdef FEAT_ARP
99 struct ArpBase *ArpBase = NULL; 100 struct ArpBase *ArpBase = NULL;
100 #endif 101 #endif
253 #endif 254 #endif
254 255
255 void 256 void
256 mch_init(void) 257 mch_init(void)
257 { 258 {
259 #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
258 static char intlibname[] = "intuition.library"; 260 static char intlibname[] = "intuition.library";
261 #endif
259 262
260 #ifdef AZTEC_C 263 #ifdef AZTEC_C
261 Enable_Abort = 0; // disallow vim to be aborted 264 Enable_Abort = 0; // disallow vim to be aborted
262 #endif 265 #endif
263 Columns = 80; 266 Columns = 80;
282 } 285 }
283 286
284 out_flush(); 287 out_flush();
285 288
286 wb_window = NULL; 289 wb_window = NULL;
287 #ifndef __amigaos4__ 290 #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
288 if ((IntuitionBase = (struct IntuitionBase *) 291 if ((IntuitionBase = (struct IntuitionBase *)
289 OpenLibrary((UBYTE *)intlibname, 0L)) == NULL) 292 OpenLibrary((UBYTE *)intlibname, 0L)) == NULL)
290 { 293 {
291 mch_errmsg(_("cannot open ")); 294 mch_errmsg(_("cannot open "));
292 mch_errmsg(intlibname); 295 mch_errmsg(intlibname);
327 struct WBArg *argp; 330 struct WBArg *argp;
328 int ac; 331 int ac;
329 char *av; 332 char *av;
330 char_u *device = NULL; 333 char_u *device = NULL;
331 int exitval = 4; 334 int exitval = 4;
332 #ifndef __amigaos4__ 335 #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
333 struct Library *DosBase; 336 struct Library *DosBase;
334 #endif 337 #endif
335 int usewin = FALSE; 338 int usewin = FALSE;
336 339
337 /* 340 /*
338 * check if we are running under DOS 2.0x or higher 341 * check if we are running under DOS 2.0x or higher
339 */ 342 */
340 #ifndef __amigaos4__ 343 #if !defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__)
341 DosBase = OpenLibrary(DOS_LIBRARY, 37L); 344 DosBase = OpenLibrary(DOS_LIBRARY, 37L);
342 if (DosBase != NULL) 345 if (DosBase != NULL)
343 // if (((struct Library *)DOSBase)->lib_Version >= 37) 346 // if (((struct Library *)DOSBase)->lib_Version >= 37)
344 { 347 {
345 CloseLibrary(DosBase); 348 CloseLibrary(DosBase);
359 fprintf(stderr, _("Need %s version %ld\n"), ArpName, ArpVersion); 362 fprintf(stderr, _("Need %s version %ld\n"), ArpName, ArpVersion);
360 exit(3); 363 exit(3);
361 } 364 }
362 # endif 365 # endif
363 } 366 }
364 #endif // __amigaos4__ 367 #endif /* __amigaos4__ __AROS__ __MORPHOS__ */
365 368
366 /* 369 /*
367 * scan argv[] for the "-f" and "-d" arguments 370 * scan argv[] for the "-f" and "-d" arguments
368 */ 371 */
369 for (i = 1; i < argc; ++i) 372 for (i = 1; i < argc; ++i)