[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110035: Port better to POSIX hosts l
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110035: Port better to POSIX hosts lacking _setjmp. |
|
Date: |
Sat, 15 Sep 2012 00:06:56 -0700 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110035
fixes bug: http://debbugs.gnu.org/12446
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-15 00:06:56 -0700
message:
Port better to POSIX hosts lacking _setjmp.
* configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols.
(_setjmp, _longjmp): Remove.
* src/lisp.h: Include <setjmp.h> here, since we use its symbols here.
All instances of '#include <setjmp.h>' removed, if the
only reason for the instance was because "lisp.h" was included.
(sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
and _longjmp with the new symbols. Emacs already uses _setjmp if
available, so this change affects only POSIXish hosts that have
sigsetjmp but not _setjmp, such as some versions of Solaris and
Unixware. (Also, POSIX-2008 marks _setjmp as obsolescent.)
* src/image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
(png_load_body) [HAVE_PNG]:
(PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
(PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
since PNG requires jmp_buf. This is the only exception to the
general rule that we now use sys_setjmp and sys_longjmp.
This exception is OK since this code does not change the signal
mask or longjmp out of a signal handler.
modified:
ChangeLog
configure.ac
src/ChangeLog
src/alloc.c
src/atimer.c
src/bidi.c
src/buffer.c
src/bytecode.c
src/callint.c
src/callproc.c
src/casefiddle.c
src/casetab.c
src/category.c
src/ccl.c
src/character.c
src/charset.c
src/chartab.c
src/cm.c
src/cmds.c
src/coding.c
src/composite.c
src/data.c
src/dbusbind.c
src/dired.c
src/dispnew.c
src/doc.c
src/doprnt.c
src/dosfns.c
src/editfns.c
src/emacs.c
src/emacsgtkfixed.c
src/eval.c
src/fileio.c
src/filelock.c
src/floatfns.c
src/fns.c
src/font.c
src/fontset.c
src/frame.c
src/fringe.c
src/ftfont.c
src/ftxfont.c
src/gnutls.c
src/gtkutil.c
src/image.c
src/indent.c
src/insdel.c
src/intervals.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/lread.c
src/macros.c
src/marker.c
src/menu.c
src/minibuf.c
src/nsfns.m
src/nsfont.m
src/nsimage.m
src/nsmenu.m
src/nsselect.m
src/nsterm.m
src/print.c
src/process.c
src/ralloc.c
src/regex.c
src/region-cache.c
src/scroll.c
src/search.c
src/sheap.c
src/sound.c
src/syntax.c
src/sysdep.c
src/term.c
src/termcap.c
src/terminal.c
src/terminfo.c
src/textprop.c
src/tparam.c
src/undo.c
src/unexaix.c
src/unexcoff.c
src/unexcw.c
src/unexsol.c
src/vm-limit.c
src/widget.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xfont.c
src/xftfont.c
src/xgselect.c
src/xmenu.c
src/xml.c
src/xrdb.c
src/xselect.c
src/xsettings.c
src/xsmfns.c
src/xterm.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-14 22:01:19 +0000
+++ b/ChangeLog 2012-09-15 07:06:56 +0000
@@ -1,3 +1,9 @@
+2012-09-15 Paul Eggert <address@hidden>
+
+ Port better to POSIX hosts lacking _setjmp (Bug#12446).
+ * configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols.
+ (_setjmp, _longjmp): Remove.
+
2012-09-14 Paul Eggert <address@hidden>
* configure.ac (--without-sync-input): Fix typo in usage message.
=== modified file 'configure.ac'
--- a/configure.ac 2012-09-14 22:01:19 +0000
+++ b/configure.ac 2012-09-15 07:06:56 +0000
@@ -3774,13 +3774,24 @@
_longjmp (j, 1);]])],
[emacs_cv_func__setjmp=yes],
[emacs_cv_func__setjmp=no])])
-if test $emacs_cv_func__setjmp = no; then
- AC_DEFINE([_setjmp], [setjmp],
- [Define to setjmp if _setjmp and _longjmp do not work. See _longjmp.])
- AC_DEFINE([_longjmp], [longjmp],
- [Define to longjmp if _setjmp and _longjmp do not work.
- Because longjmp may alter signal masks, callers of _longjmp
- should not assume that it leaves signal masks alone.])
+if test $emacs_cv_func__setjmp = yes; then
+ AC_DEFINE([HAVE__SETJMP], 1, [Define to 1 if _setjmp and _longjmp work.])
+else
+ AC_CACHE_CHECK([for sigsetjmp], [emacs_cv_func_sigsetjmp],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <setjmp.h>
+ ]],
+ [[sigjmp_buf j;
+ if (! sigsetjmp (j, 1))
+ siglongjmp (j, 1);]])],
+ [emacs_cv_func_sigsetjmp=yes],
+ [emacs_cv_func_sigsetjmp=no])])
+ if test $emacs_cv_func_sigsetjmp = yes; then
+ AC_DEFINE([HAVE_SIGSETJMP], 1,
+ [Define to 1 if sigsetjmp and siglongjmp work.
+ The value of this symbol is irrelevant if HAVE__SETJMP is defined.])
+ fi
fi
case $opsys in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-14 22:01:19 +0000
+++ b/src/ChangeLog 2012-09-15 07:06:56 +0000
@@ -1,3 +1,25 @@
+2012-09-15 Paul Eggert <address@hidden>
+
+ Port better to POSIX hosts lacking _setjmp (Bug#12446).
+ * lisp.h: Include <setjmp.h> here, since we use its symbols here.
+ All instances of '#include <setjmp.h>' removed, if the
+ only reason for the instance was because "lisp.h" was included.
+ (sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
+ Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
+ and _longjmp with the new symbols. Emacs already uses _setjmp if
+ available, so this change affects only POSIXish hosts that have
+ sigsetjmp but not _setjmp, such as some versions of Solaris and
+ Unixware. (Also, POSIX-2008 marks _setjmp as obsolescent.)
+ * image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
+ (png_load_body) [HAVE_PNG]:
+ (PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
+ (PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
+ Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
+ since PNG requires jmp_buf. This is the only exception to the
+ general rule that we now use sys_setjmp and sys_longjmp.
+ This exception is OK since this code does not change the signal
+ mask or longjmp out of a signal handler.
+
2012-09-14 Paul Eggert <address@hidden>
* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2012-09-14 22:01:19 +0000
+++ b/src/alloc.c 2012-09-15 07:06:56 +0000
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <limits.h> /* For CHAR_BIT. */
-#include <setjmp.h>
#ifdef ENABLE_CHECKING
#include <signal.h> /* For SIGABRT. */
@@ -45,7 +44,7 @@
#include "frame.h"
#include "blockinput.h"
#include "termhooks.h" /* For struct terminal. */
-#include <setjmp.h>
+
#include <verify.h>
/* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects.
@@ -4764,14 +4763,14 @@
{
char buf[10];
register int x;
- jmp_buf jbuf;
+ sys_jmp_buf jbuf;
/* Arrange for X to be put in a register. */
sprintf (buf, "1");
x = strlen (buf);
x = 2 * x - 1;
- _setjmp (jbuf);
+ sys_setjmp (jbuf);
if (longjmps_done == 1)
{
/* Came here after the longjmp at the end of the function.
@@ -4796,7 +4795,7 @@
++longjmps_done;
x = 2;
if (longjmps_done == 1)
- _longjmp (jbuf, 1);
+ sys_longjmp (jbuf, 1);
}
#endif /* not GC_SAVE_REGISTERS_ON_STACK && not GC_SETJMP_WORKS */
@@ -4902,7 +4901,7 @@
/* jmp_buf may not be aligned enough on darwin-ppc64 */
union aligned_jmpbuf {
Lisp_Object o;
- jmp_buf j;
+ sys_jmp_buf j;
} j;
volatile bool stack_grows_down_p = (char *) &j > (char *) stack_base;
#endif
@@ -4938,7 +4937,7 @@
}
#endif /* GC_SETJMP_WORKS */
- _setjmp (j.j);
+ sys_setjmp (j.j);
end = stack_grows_down_p ? (char *) &j + sizeof j : (char *) &j;
#endif /* not GC_SAVE_REGISTERS_ON_STACK */
#endif /* not HAVE___BUILTIN_UNWIND_INIT */
=== modified file 'src/atimer.c'
--- a/src/atimer.c 2012-09-07 01:27:44 +0000
+++ b/src/atimer.c 2012-09-15 07:06:56 +0000
@@ -18,7 +18,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "syssignal.h"
#include "systime.h"
=== modified file 'src/bidi.c'
--- a/src/bidi.c 2012-09-11 22:59:50 +0000
+++ b/src/bidi.c 2012-09-15 07:06:56 +0000
@@ -56,7 +56,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2012-09-11 04:22:03 +0000
+++ b/src/buffer.c 2012-09-15 07:06:56 +0000
@@ -26,7 +26,6 @@
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
-#include <setjmp.h>
#include <unistd.h>
#include <verify.h>
=== modified file 'src/bytecode.c'
--- a/src/bytecode.c 2012-09-04 17:34:54 +0000
+++ b/src/bytecode.c 2012-09-15 07:06:56 +0000
@@ -33,7 +33,7 @@
*/
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/callint.c'
--- a/src/callint.c 2012-08-25 03:11:12 +0000
+++ b/src/callint.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
#include <config.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2012-09-07 01:27:44 +0000
+++ b/src/callproc.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <errno.h>
#include <stdio.h>
-#include <setjmp.h>
#include <sys/types.h>
#include <unistd.h>
=== modified file 'src/casefiddle.c'
--- a/src/casefiddle.c 2012-08-25 06:25:00 +0000
+++ b/src/casefiddle.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/casetab.c'
--- a/src/casetab.c 2012-08-25 06:25:00 +0000
+++ b/src/casetab.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/category.c'
--- a/src/category.c 2012-08-25 06:25:00 +0000
+++ b/src/category.c 2012-09-15 07:06:56 +0000
@@ -32,7 +32,6 @@
#define CATEGORY_INLINE EXTERN_INLINE
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/ccl.c'
--- a/src/ccl.c 2012-07-05 06:32:41 +0000
+++ b/src/ccl.c 2012-09-15 07:06:56 +0000
@@ -26,7 +26,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <limits.h>
#include "lisp.h"
=== modified file 'src/character.c'
--- a/src/character.c 2012-09-04 17:34:54 +0000
+++ b/src/character.c 2012-09-15 07:06:56 +0000
@@ -36,7 +36,6 @@
#ifdef emacs
#include <sys/types.h>
-#include <setjmp.h>
#include <intprops.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-09-04 17:34:54 +0000
+++ b/src/charset.c 2012-09-15 07:06:56 +0000
@@ -32,7 +32,6 @@
#include <unistd.h>
#include <limits.h>
#include <sys/types.h>
-#include <setjmp.h>
#include <c-ctype.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/chartab.c'
--- a/src/chartab.c 2012-08-26 08:41:36 +0000
+++ b/src/chartab.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "charset.h"
=== modified file 'src/cm.c'
--- a/src/cm.c 2012-09-04 17:34:54 +0000
+++ b/src/cm.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "frame.h"
=== modified file 'src/cmds.c'
--- a/src/cmds.c 2012-08-27 16:19:34 +0000
+++ b/src/cmds.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "commands.h"
#include "character.h"
=== modified file 'src/coding.c'
--- a/src/coding.c 2012-09-04 17:34:54 +0000
+++ b/src/coding.c 2012-09-15 07:06:56 +0000
@@ -285,7 +285,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/composite.c'
--- a/src/composite.c 2012-08-27 17:23:48 +0000
+++ b/src/composite.c 2012-09-15 07:06:56 +0000
@@ -26,7 +26,6 @@
#define COMPOSITE_INLINE EXTERN_INLINE
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/data.c'
--- a/src/data.c 2012-09-12 19:16:36 +0000
+++ b/src/data.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <intprops.h>
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2012-08-27 17:23:48 +0000
+++ b/src/dbusbind.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,7 @@
#ifdef HAVE_DBUS
#include <stdio.h>
#include <dbus/dbus.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "frame.h"
#include "termhooks.h"
=== modified file 'src/dired.c'
--- a/src/dired.c 2012-09-04 17:34:54 +0000
+++ b/src/dired.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <setjmp.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-09-13 02:21:28 +0000
+++ b/src/dispnew.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#define DISPEXTERN_INLINE EXTERN_INLINE
#include <stdio.h>
-#include <setjmp.h>
#include <unistd.h>
#include "lisp.h"
=== modified file 'src/doc.c'
--- a/src/doc.c 2012-09-03 19:36:09 +0000
+++ b/src/doc.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/file.h> /* Must be after sys/types.h for USG*/
-#include <setjmp.h>
#include <fcntl.h>
#include <unistd.h>
=== modified file 'src/doprnt.c'
--- a/src/doprnt.c 2012-09-09 16:06:33 +0000
+++ b/src/doprnt.c 2012-09-15 07:06:56 +0000
@@ -102,7 +102,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <float.h>
#include <unistd.h>
#include <limits.h>
=== modified file 'src/dosfns.c'
--- a/src/dosfns.c 2012-08-17 21:52:15 +0000
+++ b/src/dosfns.c 2012-09-15 07:06:56 +0000
@@ -30,7 +30,7 @@
#include <dos.h>
#undef gettime
#undef settime
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2012-09-11 04:22:03 +0000
+++ b/src/editfns.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <sys/types.h>
#include <stdio.h>
-#include <setjmp.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2012-09-13 02:21:28 +0000
+++ b/src/emacs.c 2012-09-15 07:06:56 +0000
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <sys/file.h>
-#include <setjmp.h>
#include <unistd.h>
#include "lisp.h"
=== modified file 'src/emacsgtkfixed.c'
--- a/src/emacsgtkfixed.c 2012-09-13 04:14:33 +0000
+++ b/src/emacsgtkfixed.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,7 @@
#include "emacsgtkfixed.h"
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "frame.h"
#include "xterm.h"
=== modified file 'src/eval.c'
--- a/src/eval.c 2012-09-12 21:34:24 +0000
+++ b/src/eval.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
#include <config.h>
#include <limits.h>
-#include <setjmp.h>
#include <stdio.h>
#include "lisp.h"
#include "blockinput.h"
@@ -1072,7 +1071,7 @@
catchlist = &c;
/* Call FUNC. */
- if (! _setjmp (c.jmp))
+ if (! sys_setjmp (c.jmp))
c.val = (*func) (arg);
/* Throw works by a longjmp that comes right here. */
@@ -1140,7 +1139,7 @@
backtrace_list = catch->backlist;
lisp_eval_depth = catch->lisp_eval_depth;
- _longjmp (catch->jmp, 1);
+ sys_longjmp (catch->jmp, 1);
}
DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0,
@@ -1246,7 +1245,7 @@
c.interrupt_input_blocked = interrupt_input_blocked;
c.gcpro = gcprolist;
c.byte_stack = byte_stack_list;
- if (_setjmp (c.jmp))
+ if (sys_setjmp (c.jmp))
{
if (!NILP (h.var))
specbind (h.var, c.val);
@@ -1301,7 +1300,7 @@
c.interrupt_input_blocked = interrupt_input_blocked;
c.gcpro = gcprolist;
c.byte_stack = byte_stack_list;
- if (_setjmp (c.jmp))
+ if (sys_setjmp (c.jmp))
{
return (*hfun) (c.val);
}
@@ -1339,7 +1338,7 @@
c.interrupt_input_blocked = interrupt_input_blocked;
c.gcpro = gcprolist;
c.byte_stack = byte_stack_list;
- if (_setjmp (c.jmp))
+ if (sys_setjmp (c.jmp))
{
return (*hfun) (c.val);
}
@@ -1381,7 +1380,7 @@
c.interrupt_input_blocked = interrupt_input_blocked;
c.gcpro = gcprolist;
c.byte_stack = byte_stack_list;
- if (_setjmp (c.jmp))
+ if (sys_setjmp (c.jmp))
{
return (*hfun) (c.val);
}
@@ -1425,7 +1424,7 @@
c.interrupt_input_blocked = interrupt_input_blocked;
c.gcpro = gcprolist;
c.byte_stack = byte_stack_list;
- if (_setjmp (c.jmp))
+ if (sys_setjmp (c.jmp))
{
return (*hfun) (c.val, nargs, args);
}
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-09-05 07:18:46 +0000
+++ b/src/fileio.c 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <setjmp.h>
#include <unistd.h>
#ifdef HAVE_PWD_H
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2012-09-05 07:18:46 +0000
+++ b/src/filelock.c 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
#include <sys/stat.h>
#include <signal.h>
#include <stdio.h>
-#include <setjmp.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
=== modified file 'src/floatfns.c'
--- a/src/floatfns.c 2012-09-11 02:28:27 +0000
+++ b/src/floatfns.c 2012-09-15 07:06:56 +0000
@@ -29,7 +29,7 @@
*/
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "syssignal.h"
=== modified file 'src/fns.c'
--- a/src/fns.c 2012-09-11 22:59:50 +0000
+++ b/src/fns.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <unistd.h>
#include <time.h>
-#include <setjmp.h>
#include <intprops.h>
=== modified file 'src/font.c'
--- a/src/font.c 2012-09-06 08:04:49 +0000
+++ b/src/font.c 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
#include <config.h>
#include <float.h>
#include <stdio.h>
-#include <setjmp.h>
#include <c-ctype.h>
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2012-09-06 08:04:49 +0000
+++ b/src/fontset.c 2012-09-15 07:06:56 +0000
@@ -26,7 +26,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "blockinput.h"
=== modified file 'src/frame.c'
--- a/src/frame.c 2012-09-13 05:18:26 +0000
+++ b/src/frame.c 2012-09-15 07:06:56 +0000
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <errno.h>
#include <limits.h>
-#include <setjmp.h>
#include <c-ctype.h>
=== modified file 'src/fringe.c'
--- a/src/fringe.c 2012-09-09 20:10:36 +0000
+++ b/src/fringe.c 2012-09-15 07:06:56 +0000
@@ -18,7 +18,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "frame.h"
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2012-09-06 08:04:49 +0000
+++ b/src/ftfont.c 2012-09-15 07:06:56 +0000
@@ -21,8 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
-
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
=== modified file 'src/ftxfont.c'
--- a/src/ftxfont.c 2012-09-06 08:04:49 +0000
+++ b/src/ftxfont.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <X11/Xlib.h>
#include "lisp.h"
=== modified file 'src/gnutls.c'
--- a/src/gnutls.c 2012-08-18 02:49:24 +0000
+++ b/src/gnutls.c 2012-09-15 07:06:56 +0000
@@ -18,7 +18,6 @@
#include <config.h>
#include <errno.h>
-#include <setjmp.h>
#include "lisp.h"
#include "process.h"
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2012-09-07 01:27:44 +0000
+++ b/src/gtkutil.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#ifdef USE_GTK
#include <float.h>
#include <stdio.h>
-#include <setjmp.h>
#include <c-ctype.h>
=== modified file 'src/image.c'
--- a/src/image.c 2012-09-13 01:22:08 +0000
+++ b/src/image.c 2012-09-15 07:06:56 +0000
@@ -5514,6 +5514,13 @@
#endif /* HAVE_NTGUI */
+/* Possibly inefficient/inexact substitutes for _setjmp and _longjmp.
+ Do not use sys_setjmp, as PNG supports only jmp_buf. The _longjmp
+ substitute may munge the signal mask, but that should be OK here. */
+#ifndef HAVE__SETJMP
+# define _setjmp(j) setjmp (j)
+# define _longjmp longjmp
+#endif
#if (PNG_LIBPNG_VER < 10500)
#define PNG_LONGJMP(ptr) (_longjmp ((ptr)->jmpbuf, 1))
@@ -5593,7 +5600,7 @@
struct png_load_context
{
- /* These are members so that _longjmp doesn't munge local variables. */
+ /* These are members so that longjmp doesn't munge local variables. */
png_struct *png_ptr;
png_info *info_ptr;
png_info *end_info;
@@ -6129,9 +6136,9 @@
struct my_jpeg_error_mgr
{
struct jpeg_error_mgr pub;
- jmp_buf setjmp_buffer;
+ sys_jmp_buf setjmp_buffer;
- /* The remaining members are so that _longjmp doesn't munge local
+ /* The remaining members are so that longjmp doesn't munge local
variables. */
struct jpeg_decompress_struct cinfo;
enum
@@ -6151,7 +6158,7 @@
{
struct my_jpeg_error_mgr *mgr = (struct my_jpeg_error_mgr *) cinfo->err;
mgr->failure_code = MY_JPEG_ERROR_EXIT;
- _longjmp (mgr->setjmp_buffer, 1);
+ sys_longjmp (mgr->setjmp_buffer, 1);
}
@@ -6401,7 +6408,7 @@
error is detected. This function will perform a longjmp. */
mgr->cinfo.err = fn_jpeg_std_error (&mgr->pub);
mgr->pub.error_exit = my_error_exit;
- if (_setjmp (mgr->setjmp_buffer))
+ if (sys_setjmp (mgr->setjmp_buffer))
{
switch (mgr->failure_code)
{
@@ -6460,14 +6467,14 @@
if (!check_image_size (f, width, height))
{
mgr->failure_code = MY_JPEG_INVALID_IMAGE_SIZE;
- _longjmp (mgr->setjmp_buffer, 1);
+ sys_longjmp (mgr->setjmp_buffer, 1);
}
/* Create X image and pixmap. */
if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
{
mgr->failure_code = MY_JPEG_CANNOT_CREATE_X;
- _longjmp (mgr->setjmp_buffer, 1);
+ sys_longjmp (mgr->setjmp_buffer, 1);
}
/* Allocate colors. When color quantization is used,
=== modified file 'src/indent.c'
--- a/src/indent.c 2012-09-04 17:34:54 +0000
+++ b/src/indent.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2012-09-14 14:23:50 +0000
+++ b/src/insdel.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
#include <config.h>
-#include <setjmp.h>
#include <intprops.h>
=== modified file 'src/intervals.c'
--- a/src/intervals.c 2012-09-04 17:34:54 +0000
+++ b/src/intervals.c 2012-09-15 07:06:56 +0000
@@ -41,7 +41,6 @@
#define INTERVALS_INLINE EXTERN_INLINE
-#include <setjmp.h>
#include <intprops.h>
#include "lisp.h"
#include "intervals.h"
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2012-09-13 16:23:06 +0000
+++ b/src/keyboard.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,7 @@
#define KEYBOARD_INLINE EXTERN_INLINE
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "termchar.h"
#include "termopts.h"
@@ -145,7 +145,7 @@
/* For longjmp to where kbd input is being done. */
-static jmp_buf getcjmp;
+static sys_jmp_buf getcjmp;
/* True while doing kbd input. */
int waiting_for_input;
@@ -434,8 +434,8 @@
Lisp_Object *, ptrdiff_t);
static Lisp_Object make_lispy_switch_frame (Lisp_Object);
static int help_char_p (Lisp_Object);
-static void save_getcjmp (jmp_buf);
-static void restore_getcjmp (jmp_buf);
+static void save_getcjmp (sys_jmp_buf);
+static void restore_getcjmp (sys_jmp_buf);
static Lisp_Object apply_modifiers (int, Lisp_Object);
static void clear_event (struct input_event *);
static Lisp_Object restore_kboard_configuration (Lisp_Object);
@@ -2315,8 +2315,8 @@
{
volatile Lisp_Object c;
ptrdiff_t jmpcount;
- jmp_buf local_getcjmp;
- jmp_buf save_jump;
+ sys_jmp_buf local_getcjmp;
+ sys_jmp_buf save_jump;
volatile int key_already_recorded = 0;
Lisp_Object tem, save;
volatile Lisp_Object previous_echo_area_message;
@@ -2562,7 +2562,7 @@
it *must not* be in effect when we call redisplay. */
jmpcount = SPECPDL_INDEX ();
- if (_setjmp (local_getcjmp))
+ if (sys_setjmp (local_getcjmp))
{
/* Handle quits while reading the keyboard. */
/* We must have saved the outer value of getcjmp here,
@@ -3394,13 +3394,13 @@
See read_process_output. */
static void
-save_getcjmp (jmp_buf temp)
+save_getcjmp (sys_jmp_buf temp)
{
memcpy (temp, getcjmp, sizeof getcjmp);
}
static void
-restore_getcjmp (jmp_buf temp)
+restore_getcjmp (sys_jmp_buf temp)
{
memcpy (getcjmp, temp, sizeof getcjmp);
}
@@ -10979,7 +10979,7 @@
do_switch_frame (make_lispy_switch_frame (internal_last_event_frame),
0, 0, Qnil);
- _longjmp (getcjmp, 1);
+ sys_longjmp (getcjmp, 1);
}
DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2012-09-04 17:34:54 +0000
+++ b/src/keymap.c 2012-09-15 07:06:56 +0000
@@ -40,7 +40,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "commands.h"
#include "character.h"
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-09-11 23:50:28 +0000
+++ b/src/lisp.h 2012-09-15 07:06:56 +0000
@@ -20,6 +20,7 @@
#ifndef EMACS_LISP_H
#define EMACS_LISP_H
+#include <setjmp.h>
#include <stdalign.h>
#include <stdarg.h>
#include <stdbool.h>
@@ -1963,7 +1964,24 @@
static struct Lisp_Kboard_Objfwd ko_fwd; \
defvar_kboard (&ko_fwd, lname, offsetof (KBOARD, vname ## _)); \
} while (0)
+
+/* Save and restore the instruction and environment pointers,
+ without affecting the signal mask. */
+#ifdef HAVE__SETJMP
+typedef jmp_buf sys_jmp_buf;
+# define sys_setjmp(j) _setjmp (j)
+# define sys_longjmp(j, v) _longjmp (j, v)
+#elif defined HAVE_SIGSETJMP
+typedef sigjmp_buf sys_jmp_buf;
+# define sys_setjmp(j) sigsetjmp (j, 0)
+# define sys_longjmp(j, v) siglongjmp (j, v)
+#else
+/* A non-POSIX platform; assume longjmp does not affect the sigmask. */
+typedef jmp_buf sys_jmp_buf;
+# define sys_setjmp(j) setjmp (j)
+# define sys_longjmp(j, v) longjmp (j, v)
+#endif
/* Structure for recording Lisp call stack for backtrace purposes. */
@@ -2056,7 +2074,7 @@
Lisp_Object volatile val;
struct catchtag *volatile next;
struct gcpro *gcpro;
- jmp_buf jmp;
+ sys_jmp_buf jmp;
struct backtrace *backlist;
struct handler *handlerlist;
EMACS_INT lisp_eval_depth;
=== modified file 'src/lread.c'
--- a/src/lread.c 2012-09-11 04:22:03 +0000
+++ b/src/lread.c 2012-09-15 07:06:56 +0000
@@ -25,7 +25,6 @@
#include <sys/file.h>
#include <errno.h>
#include <limits.h> /* For CHAR_BIT. */
-#include <setjmp.h>
#include <stat-time.h>
#include "lisp.h"
#include "intervals.h"
=== modified file 'src/macros.c'
--- a/src/macros.c 2012-08-17 23:38:43 +0000
+++ b/src/macros.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "macros.h"
#include "commands.h"
=== modified file 'src/marker.c'
--- a/src/marker.c 2012-09-11 04:22:03 +0000
+++ b/src/marker.c 2012-09-15 07:06:56 +0000
@@ -18,7 +18,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/menu.c'
--- a/src/menu.c 2012-09-04 17:34:54 +0000
+++ b/src/menu.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <limits.h> /* for INT_MAX */
#include "lisp.h"
=== modified file 'src/minibuf.c'
--- a/src/minibuf.c 2012-09-11 04:22:03 +0000
+++ b/src/minibuf.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <errno.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "commands.h"
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2012-09-07 01:27:44 +0000
+++ b/src/nsfns.m 2012-09-15 07:06:56 +0000
@@ -31,7 +31,6 @@
#include <config.h>
#include <math.h>
-#include <setjmp.h>
#include <c-strcase.h>
#include "lisp.h"
=== modified file 'src/nsfont.m'
--- a/src/nsfont.m 2012-09-06 08:04:49 +0000
+++ b/src/nsfont.m 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
/* This should be the first include, as it may set up #defines affecting
interpretation of even the system includes. */
#include <config.h>
-#include <setjmp.h>
#include "lisp.h"
#include "dispextern.h"
=== modified file 'src/nsimage.m'
--- a/src/nsimage.m 2012-08-16 21:58:44 +0000
+++ b/src/nsimage.m 2012-09-15 07:06:56 +0000
@@ -28,7 +28,6 @@
/* This should be the first include, as it may set up #defines affecting
interpretation of even the system includes. */
#include <config.h>
-#include <setjmp.h>
#include "lisp.h"
#include "dispextern.h"
=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m 2012-09-04 17:34:54 +0000
+++ b/src/nsmenu.m 2012-09-15 07:06:56 +0000
@@ -24,7 +24,6 @@
/* This should be the first include, as it may set up #defines affecting
interpretation of even the system includes. */
#include <config.h>
-#include <setjmp.h>
#include "lisp.h"
#include "window.h"
=== modified file 'src/nsselect.m'
--- a/src/nsselect.m 2012-08-07 13:37:21 +0000
+++ b/src/nsselect.m 2012-09-15 07:06:56 +0000
@@ -28,7 +28,6 @@
/* This should be the first include, as it may set up #defines affecting
interpretation of even the system includes. */
#include <config.h>
-#include <setjmp.h>
#include "lisp.h"
#include "nsterm.h"
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-09-11 17:08:02 +0000
+++ b/src/nsterm.m 2012-09-15 07:06:56 +0000
@@ -35,7 +35,6 @@
#include <time.h>
#include <signal.h>
#include <unistd.h>
-#include <setjmp.h>
#include <c-ctype.h>
#include <c-strcase.h>
=== modified file 'src/print.c'
--- a/src/print.c 2012-09-11 04:22:03 +0000
+++ b/src/print.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/process.c'
--- a/src/process.c 2012-09-13 02:21:28 +0000
+++ b/src/process.c 2012-09-15 07:06:56 +0000
@@ -25,12 +25,9 @@
#include <stdio.h>
#include <errno.h>
-#include <setjmp.h>
#include <sys/types.h> /* Some typedefs are used in sys/file.h. */
#include <sys/file.h>
#include <sys/stat.h>
-#include <setjmp.h>
-
#include <unistd.h>
#include <fcntl.h>
@@ -5421,7 +5418,7 @@
/* Sending data to subprocess */
-static jmp_buf send_process_frame;
+static sys_jmp_buf send_process_frame;
static Lisp_Object process_sent_to;
static _Noreturn void
@@ -5431,7 +5428,7 @@
sigemptyset (&unblocked);
sigaddset (&unblocked, SIGPIPE);
pthread_sigmask (SIG_UNBLOCK, &unblocked, 0);
- _longjmp (send_process_frame, 1);
+ sys_longjmp (send_process_frame, 1);
}
static void
@@ -5640,7 +5637,7 @@
/* 2000-09-21: Emacs 20.7, sparc-sun-solaris-2.6, GCC 2.95.2,
CFLAGS="-g -O": The value of the parameter `proc' is clobbered
when returning with longjmp despite being declared volatile. */
- if (!_setjmp (send_process_frame))
+ if (!sys_setjmp (send_process_frame))
{
p = XPROCESS (proc); /* Repair any setjmp clobbering. */
process_sent_to = proc;
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2012-09-04 17:34:54 +0000
+++ b/src/ralloc.c 2012-09-15 07:06:56 +0000
@@ -25,7 +25,7 @@
#ifdef emacs
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h" /* Needed for VALBITS. */
#include "blockinput.h"
=== modified file 'src/regex.c'
--- a/src/regex.c 2012-09-03 19:36:09 +0000
+++ b/src/regex.c 2012-09-15 07:06:56 +0000
@@ -126,7 +126,6 @@
that make sense only in Emacs. */
#ifdef emacs
-# include <setjmp.h>
# include "lisp.h"
# include "character.h"
# include "buffer.h"
=== modified file 'src/region-cache.c'
--- a/src/region-cache.c 2012-09-04 17:34:54 +0000
+++ b/src/region-cache.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/scroll.c'
--- a/src/scroll.c 2012-09-04 17:34:54 +0000
+++ b/src/scroll.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "termchar.h"
#include "dispextern.h"
=== modified file 'src/search.c'
--- a/src/search.c 2012-09-04 17:34:54 +0000
+++ b/src/search.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "syntax.h"
#include "category.h"
=== modified file 'src/sheap.c'
--- a/src/sheap.c 2012-01-19 07:21:25 +0000
+++ b/src/sheap.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include <unistd.h>
@@ -93,4 +93,3 @@
bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
message ("%s", buf);
}
-
=== modified file 'src/sound.c'
--- a/src/sound.c 2012-09-13 02:21:28 +0000
+++ b/src/sound.c 2012-09-15 07:06:56 +0000
@@ -44,7 +44,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <errno.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "dispextern.h"
#include "atimer.h"
=== modified file 'src/syntax.c'
--- a/src/syntax.c 2012-09-08 14:23:01 +0000
+++ b/src/syntax.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,7 @@
#include <config.h>
#include <sys/types.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "commands.h"
#include "character.h"
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2012-09-13 02:21:28 +0000
+++ b/src/sysdep.c 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
#include <execinfo.h>
#include <stdio.h>
-#include <setjmp.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
#include <grp.h>
=== modified file 'src/term.c'
--- a/src/term.c 2012-09-13 02:21:28 +0000
+++ b/src/term.c 2012-09-15 07:06:56 +0000
@@ -25,7 +25,6 @@
#include <sys/file.h>
#include <sys/time.h>
#include <unistd.h>
-#include <setjmp.h>
#include "lisp.h"
#include "termchar.h"
=== modified file 'src/termcap.c'
--- a/src/termcap.c 2012-07-05 18:35:48 +0000
+++ b/src/termcap.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
/* Emacs config.h may rename various library functions such as malloc. */
#include <config.h>
-#include <setjmp.h>
#include <sys/file.h>
#include <fcntl.h>
#include <unistd.h>
=== modified file 'src/terminal.c'
--- a/src/terminal.c 2012-09-04 17:34:54 +0000
+++ b/src/terminal.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#define TERMHOOKS_INLINE EXTERN_INLINE
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "frame.h"
=== modified file 'src/terminfo.c'
--- a/src/terminfo.c 2012-09-04 17:34:54 +0000
+++ b/src/terminfo.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,6 @@
#include <config.h>
#include "tparam.h"
-#include <setjmp.h>
#include "lisp.h"
/* Define these variables that serve as global parameters to termcap,
=== modified file 'src/textprop.c'
--- a/src/textprop.c 2012-09-07 14:45:28 +0000
+++ b/src/textprop.c 2012-09-15 07:06:56 +0000
@@ -17,7 +17,7 @@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "intervals.h"
#include "character.h"
=== modified file 'src/tparam.c'
--- a/src/tparam.c 2012-09-04 17:34:54 +0000
+++ b/src/tparam.c 2012-09-15 07:06:56 +0000
@@ -19,7 +19,7 @@
/* Emacs config.h may rename various library functions such as malloc. */
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h" /* for xmalloc */
#include "tparam.h"
=== modified file 'src/undo.c'
--- a/src/undo.c 2012-08-28 06:20:08 +0000
+++ b/src/undo.c 2012-09-15 07:06:56 +0000
@@ -18,7 +18,7 @@
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
=== modified file 'src/unexaix.c'
--- a/src/unexaix.c 2012-08-19 20:02:24 +0000
+++ b/src/unexaix.c 2012-09-15 07:06:56 +0000
@@ -89,7 +89,6 @@
static int pagemask;
-#include <setjmp.h>
#include "lisp.h"
static void
=== modified file 'src/unexcoff.c'
--- a/src/unexcoff.c 2012-08-19 20:02:24 +0000
+++ b/src/unexcoff.c 2012-09-15 07:06:56 +0000
@@ -120,7 +120,6 @@
#define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
-#include <setjmp.h>
#include "lisp.h"
static void
=== modified file 'src/unexcw.c'
--- a/src/unexcw.c 2012-01-19 07:21:25 +0000
+++ b/src/unexcw.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include "unexec.h"
-#include <setjmp.h>
#include <lisp.h>
#include <stdio.h>
#include <fcntl.h>
=== modified file 'src/unexsol.c'
--- a/src/unexsol.c 2012-06-16 12:24:15 +0000
+++ b/src/unexsol.c 2012-09-15 07:06:56 +0000
@@ -4,7 +4,6 @@
#include "unexec.h"
#include <dlfcn.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c 2012-08-19 21:00:09 +0000
+++ b/src/vm-limit.c 2012-09-15 07:06:56 +0000
@@ -17,7 +17,6 @@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <setjmp.h>
#include <unistd.h> /* for 'environ', on AIX */
#include "lisp.h"
#include "mem-limits.h"
=== modified file 'src/widget.c'
--- a/src/widget.c 2012-09-07 01:27:44 +0000
+++ b/src/widget.c 2012-09-15 07:06:56 +0000
@@ -30,7 +30,7 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "xterm.h"
=== modified file 'src/window.c'
--- a/src/window.c 2012-09-11 15:42:50 +0000
+++ b/src/window.c 2012-09-15 07:06:56 +0000
@@ -23,7 +23,6 @@
#define WINDOW_INLINE EXTERN_INLINE
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-09-14 06:55:38 +0000
+++ b/src/xdisp.c 2012-09-15 07:06:56 +0000
@@ -273,7 +273,6 @@
#include <config.h>
#include <stdio.h>
#include <limits.h>
-#include <setjmp.h>
#include "lisp.h"
#include "keyboard.h"
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2012-09-11 22:59:50 +0000
+++ b/src/xfaces.c 2012-09-15 07:06:56 +0000
@@ -204,7 +204,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h> /* This needs to be before termchar.h */
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-08-18 06:06:39 +0000
+++ b/src/xfns.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
#include <math.h>
-#include <setjmp.h>
#include <unistd.h>
/* This makes the fields of a Display accessible, in Xlib header files. */
=== modified file 'src/xfont.c'
--- a/src/xfont.c 2012-09-06 08:04:49 +0000
+++ b/src/xfont.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <X11/Xlib.h>
#include "lisp.h"
=== modified file 'src/xftfont.c'
--- a/src/xftfont.c 2012-09-06 08:04:49 +0000
+++ b/src/xftfont.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
=== modified file 'src/xgselect.c'
--- a/src/xgselect.c 2012-09-11 22:59:50 +0000
+++ b/src/xgselect.c 2012-09-15 07:06:56 +0000
@@ -19,14 +19,12 @@
#include <config.h>
-#include <setjmp.h>
#include "xgselect.h"
#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
#include <glib.h>
#include <errno.h>
-#include <setjmp.h>
#include "xterm.h"
int
=== modified file 'src/xmenu.c'
--- a/src/xmenu.c 2012-09-07 01:27:44 +0000
+++ b/src/xmenu.c 2012-09-15 07:06:56 +0000
@@ -33,7 +33,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "keyboard.h"
=== modified file 'src/xml.c'
--- a/src/xml.c 2012-06-16 12:24:15 +0000
+++ b/src/xml.c 2012-09-15 07:06:56 +0000
@@ -20,7 +20,6 @@
#ifdef HAVE_LIBXML2
-#include <setjmp.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/HTMLparser.h>
=== modified file 'src/xrdb.c'
--- a/src/xrdb.c 2012-07-05 18:35:48 +0000
+++ b/src/xrdb.c 2012-09-15 07:06:56 +0000
@@ -26,7 +26,6 @@
#include <epaths.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
=== modified file 'src/xselect.c'
--- a/src/xselect.c 2012-09-04 17:34:54 +0000
+++ b/src/xselect.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#include <config.h>
#include <limits.h>
#include <stdio.h> /* termhooks.h needs this */
-#include <setjmp.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
=== modified file 'src/xsettings.c'
--- a/src/xsettings.c 2012-07-12 03:45:46 +0000
+++ b/src/xsettings.c 2012-09-15 07:06:56 +0000
@@ -21,7 +21,6 @@
#include <float.h>
#include <limits.h>
-#include <setjmp.h>
#include <fcntl.h>
#include "lisp.h"
#include "xterm.h"
@@ -711,12 +710,12 @@
if (send_event_p)
store_config_changed_event (Qfont_render,
XCAR (dpyinfo->name_list_element));
- Vxft_settings
+ Vxft_settings
= make_formatted_string (buf, format,
oldsettings.aa, oldsettings.hinting,
oldsettings.rgba, oldsettings.lcdfilter,
oldsettings.hintstyle, oldsettings.dpi);
-
+
}
else
FcPatternDestroy (pat);
=== modified file 'src/xsmfns.c'
--- a/src/xsmfns.c 2012-08-27 17:23:48 +0000
+++ b/src/xsmfns.c 2012-09-15 07:06:56 +0000
@@ -29,7 +29,6 @@
#include <unistd.h>
#include <sys/param.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "systime.h"
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2012-09-13 02:21:28 +0000
+++ b/src/xterm.c 2012-09-15 07:06:56 +0000
@@ -22,7 +22,6 @@
#include <config.h>
#include <stdio.h>
-#include <setjmp.h>
#ifdef HAVE_X_WINDOWS
@@ -47,7 +46,6 @@
#include <fcntl.h>
#include <errno.h>
-#include <setjmp.h>
#include <sys/stat.h>
/* Caused redefinition of DBL_DIG on Netbsd; seems not to be needed. */
/* #include <sys/param.h> */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110035: Port better to POSIX hosts lacking _setjmp.,
Paul Eggert <=