diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-09-17 04:07:36 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-09-17 04:07:36 -0800 |
| commit | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (patch) | |
| tree | 6dd6784d63e54cb18071df8e28fbdbc27d418728 /src/w32xfns.c | |
| parent | f701ab72dd55460d23c8b029550aa4d7ecef3cfa (diff) | |
| parent | bb7dce392f6d9d5fc4b9d7de09ff920a52f07669 (diff) | |
Merge from trunk
Diffstat (limited to 'src/w32xfns.c')
| -rw-r--r-- | src/w32xfns.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/w32xfns.c b/src/w32xfns.c index dfafb0ac74..1a67b018dd 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -19,7 +19,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <signal.h> #include <stdio.h> -#include <setjmp.h> #include "lisp.h" #include "keyboard.h" @@ -131,7 +130,7 @@ get_frame_dc (FRAME_PTR f) HDC hdc; if (f->output_method != output_w32) - abort (); + emacs_abort (); enter_crit (); |