[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#12316: Simplify redefinition of 'abort'.
From: |
Eli Zaretskii |
Subject: |
bug#12316: Simplify redefinition of 'abort'. |
Date: |
Fri, 31 Aug 2012 17:41:23 +0300 |
> Date: Thu, 30 Aug 2012 20:14:51 -0700
> From: Paul Eggert <eggert@cs.ucla.edu>
> CC: Eli Zaretskii <eliz@gnu.org>, Juanma Barranquero <lekktu@gmail.com>
>
> === modified file 'src/msdos.c'
> --- src/msdos.c 2012-08-21 10:21:04 +0000
> +++ src/msdos.c 2012-08-31 03:06:13 +0000
> @@ -4215,26 +4215,9 @@
> }
> #endif
>
> -#ifdef abort
> -#undef abort
> -void
> -dos_abort (char *file, int line)
> -{
> - char buffer1[200], buffer2[400];
> - int i, j;
> -
> - sprintf (buffer1, "<EMACS FATAL ERROR IN %s LINE %d>", file, line);
> - for (i = j = 0; buffer1[i]; i++) {
> - buffer2[j++] = buffer1[i];
> - buffer2[j++] = 0x70;
> - }
> - dosmemput (buffer2, j, (int)ScreenPrimary);
> - ScreenSetCursor (2, 0);
> - abort ();
> -}
> -#else
> -void
> -abort (void)
> +#ifdef HAVE_NTGUI <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
> +void
> +emacs_abort (void)
> {
> dos_ttcooked ();
> ScreenSetCursor (10, 0);
The line marked above is wrong: code on msdos.c has no relation
whatsoever to the Windows build.