* alloc.c: Do not define struct catchtag.

* eval.c: Move struct catchtag definition ...
* lisp.h: ... here.

* image.c: Move png.h #include earlier to avoid warnings.

* xterm.c:
* xsmfns.c:
* xselect.c:
* xrdb.c:
* xmenu.c:
* xftfont.c:
* xfont.c:
* xfns.c:
* xfaces.c:
* xdisp.c:
* window.c:
* widget.c:
* w32xfns.c:
* w32uniscribe.c:
* w32term.c:
* w32select.c:
* w32reg.c:
* w32proc.c:
* w32menu.c:
* w32inevt.c:
* w32heap.c:
* w32font.c:
* w32fns.c:
* w32console.c:
* w32.c:
* w16select.c:
* vm-limit.c:
* unexsol.c:
* unexec.c:
* unexcw.c:
* unexaix.c:
* undo.c:
* tparam.c:
* textprop.c:
* terminfo.c:
* terminal.c:
* termcap.c:
* term.c:
* syntax.c:
* sound.c:
* sheap.c:
* search.c:
* scroll.c:
* region-cache.c:
* regex.c:
* ralloc.c:
* process.c:
* print.c:
* msdos.c:
* minibuf.c:
* menu.c:
* marker.c:
* macros.c:
* keymap.c:
* keyboard.c:
* intervals.c:
* insdel.c:
* indent.c:
* gtkutil.c:
* ftxfont.c:
* ftfont.c:
* fringe.c:
* frame.c:
* fontset.c:
* font.c:
* fns.c:
* floatfns.c:
* filelock.c:
* fileio.c:
* emacs.c:
* editfns.c:
* dosfns.c:
* doprnt.c:
* doc.c:
* dispnew.c:
* dired.c:
* dbusbind.c:
* data.c:
* composite.c:
* coding.c:
* cmds.c:
* cm.c:
* chartab.c:
* charset.c:
* character.c:
* ccl.c:
* category.c:
* casetab.c:
* casefiddle.c:
* callproc.c:
* callint.c:
* bytecode.c:
* buffer.c:
* atimer.c: Include setjmp.h.  (Bug#4643)

* xlwmenu.c:
* lwlib.c:
* lwlib-utils.c:
* lwlib-Xm.c:
* lwlib-Xlw.c:
* lwlib-Xaw.c: Include setjmp.h.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index bd9902c876891f75d2f7168ed777e6146287c49e..27f14f5f1db0f27ce50d64e07b88edbf171e46e4 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * xlwmenu.c:
+       * lwlib.c:
+       * lwlib-utils.c:
+       * lwlib-Xm.c:
+       * lwlib-Xlw.c:
+       * lwlib-Xaw.c: Include setjmp.h.
+
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.1.

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 14d85db428e65940cbf776b867bbe6c29a7a7219..4923e58a9acd2fa201a8ec9e647a79289fc96248 100644 (file)
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -25,6 +25,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "../src/lisp.h"
 

diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 658899fa5dc0ea02b86b8f0ab15d2b97b7d38bee..5ed075cf8714960bc89589a34f5e5af6813bb839 100644 (file)
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "lisp.h"
 
 #include "lwlib-Xlw.h"

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 6fdd236a03af32d59b66bdba3e15256223338fb0..48faea36e62a3ab79686699659f6950cbaf1dd6e 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -26,6 +26,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include <unistd.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>

diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index dbdaf3c1b9957fad77f3f458b3e03df960799a7f..1b9f04f96295bf2fe18ad6d3d03e37f0e455899b 100644 (file)
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -31,6 +31,7 @@ Boston, MA 02110-1301, USA.  */
 #undef index
 #undef rindex
 
+#include <setjmp.h>
 #include "../src/lisp.h"
 
 #include <X11/Xatom.h>

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 80619e5e356303c3f4a6cbb1aa0b171aceb6d106..c887d8bd843860751783a6e2f9ebcdd4908c8bb1 100644 (file)
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "../src/lisp.h"
 
 #include <sys/types.h>

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index db12eb43ec989dbe79f1c991360ab419a5feb1aa..8eb6c752531b9a1a394844356fa827a780a362cb 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -26,6 +26,7 @@ Boston, MA 02110-1301, USA.  */
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "lisp.h"
 
 #include <stdio.h>

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d4c0a2fc953b0d8f7a0c15a6e070e1a2e0768a3..51c01fbc19967bd952d15bc0ecf6151100266b55 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,106 @@
+2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * alloc.c: Do not define struct catchtag.
+       * eval.c: Move struct catchtag definition ...
+       * lisp.h: ... here.
+
+       * image.c: Move png.h #include earlier to avoid warnings.
+
+       * xterm.c:
+       * xsmfns.c:
+       * xselect.c:
+       * xrdb.c:
+       * xmenu.c:
+       * xftfont.c:
+       * xfont.c:
+       * xfns.c:
+       * xfaces.c:
+       * xdisp.c:
+       * window.c:
+       * widget.c:
+       * w32xfns.c:
+       * w32uniscribe.c:
+       * w32term.c:
+       * w32select.c:
+       * w32reg.c:
+       * w32proc.c:
+       * w32menu.c:
+       * w32inevt.c:
+       * w32heap.c:
+       * w32font.c:
+       * w32fns.c:
+       * w32console.c:
+       * w32.c:
+       * w16select.c:
+       * vm-limit.c:
+       * unexsol.c:
+       * unexec.c:
+       * unexcw.c:
+       * unexaix.c:
+       * undo.c:
+       * tparam.c:
+       * textprop.c:
+       * terminfo.c:
+       * terminal.c:
+       * termcap.c:
+       * term.c:
+       * syntax.c:
+       * sound.c:
+       * sheap.c:
+       * search.c:
+       * scroll.c:
+       * region-cache.c:
+       * regex.c:
+       * ralloc.c:
+       * process.c:
+       * print.c:
+       * msdos.c:
+       * minibuf.c:
+       * menu.c:
+       * marker.c:
+       * macros.c:
+       * keymap.c:
+       * keyboard.c:
+       * intervals.c:
+       * insdel.c:
+       * indent.c:
+       * gtkutil.c:
+       * ftxfont.c:
+       * ftfont.c:
+       * fringe.c:
+       * frame.c:
+       * fontset.c:
+       * font.c:
+       * fns.c:
+       * floatfns.c:
+       * filelock.c:
+       * fileio.c:
+       * emacs.c:
+       * editfns.c:
+       * dosfns.c:
+       * doprnt.c:
+       * doc.c:
+       * dispnew.c:
+       * dired.c:
+       * dbusbind.c:
+       * data.c:
+       * composite.c:
+       * coding.c:
+       * cmds.c:
+       * cm.c:
+       * chartab.c:
+       * charset.c:
+       * character.c:
+       * ccl.c:
+       * category.c:
+       * casetab.c:
+       * casefiddle.c:
+       * callproc.c:
+       * callint.c:
+       * bytecode.c:
+       * buffer.c:
+       * atimer.c: Include setjmp.h.  (Bug#4643)
+
 2009-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Remove leftover table unibyte_to_multibyte_table.

diff --git a/src/alloc.c b/src/alloc.c
index d11eff3d387704e6b29796a930be378273df0cf1..557621af797f9727a65f587f7c1bc0821f328d9f 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <limits.h>            /* For CHAR_BIT.  */
+#include <setjmp.h>
 
 #ifdef STDC_HEADERS
 #include <stddef.h>            /* For offsetof, used by PSEUDOVECSIZE. */
@@ -4939,13 +4940,6 @@ staticpro (varaddress)
     abort ();
 }
 
-struct catchtag
-{
-    Lisp_Object tag;
-    Lisp_Object val;
-    struct catchtag *next;
-};
-
 \f
 /***********************************************************************
                          Protection from GC

diff --git a/src/atimer.c b/src/atimer.c
index 4fc593b6d7300756b63c8e255f012fe8acf408d2..308d4688d7b29bff8b3fec81263523ae97a97634 100644 (file)
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -20,6 +20,7 @@ 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 <syssignal.h>
 #include <systime.h>

diff --git a/src/buffer.c b/src/buffer.c
index d74a40ac4f570a1a5dee78a44a7a17942ce07d0c..2fc7a8b3a7ced2cab8ed44c30e5e1cae5d646e60 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifndef USE_CRT_DLL
 extern int errno;

diff --git a/src/bytecode.c b/src/bytecode.c
index 0335af818601ce5c9087a5283d61b0f43b259912..4a1e2da35561c15408c104f713db4fbffaac1939 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -34,6 +34,7 @@ by Hallvard:
  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/callint.c b/src/callint.c
index 074f9c0fc5b3fbaf4d9ccf1777b3f3852e386187..a9f8f23146274604254fb9cfa646bc80f1287850 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/callproc.c b/src/callproc.c
index 14d1ac0b3d6d789f7c1bc71e72f92ca39bca3c5d..b1918b9cd5e0d4df74b7122acc3143792ccde1f0 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 #include <errno.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifndef USE_CRT_DLL
 extern int errno;

diff --git a/src/casefiddle.c b/src/casefiddle.c
index f01faa01198e2e8866c56a046110e1cff6e4c755..112198b3225e0a14f07d074d15efc5512a81c4ea 100644 (file)
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/casetab.c b/src/casetab.c
index 95fca03584b010e8f3ab7d4719b15a143b4c676a..5ae4ee2b5f25aca09928371db70540af589fb8a7 100644 (file)
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/category.c b/src/category.c
index 84af413120fbab13d026e111ad51313bff66451d..babed58c7feac5fe91f098aabdf59ccee3502801 100644 (file)
--- a/src/category.c
+++ b/src/category.c
@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/ccl.c b/src/ccl.c
index f110291ac7209a6b4b0edfbe0b874762835ba368..03600158049371386b911576d4ac4753c11f64f9 100644 (file)
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -27,6 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

diff --git a/src/character.c b/src/character.c
index e2896444c25d76f51c873c7591434a149a669354..bfe99766bc817040c9a86779a78a090b02f668d3 100644 (file)
--- a/src/character.c
+++ b/src/character.c
@@ -34,6 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef emacs
 
 #include <sys/types.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"

diff --git a/src/charset.c b/src/charset.c
index 7ca9240d74f0789ba344a1909d9173ea316a864e..cfdf95565a7deba3729936f2e10b7189d33859ef 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -31,6 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #include "charset.h"

diff --git a/src/chartab.c b/src/chartab.c
index 30f7e8bef2c743509dae6f0d1b414b3abf2c751d..79906c38fd73ce495fea81d3cfd4839c7e3b339f 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
 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"

diff --git a/src/cm.c b/src/cm.c
index 563a488c43b90816cd508101f2fcfd0cba969abd..4077073f9f45e62440c41cad0b23985b3f2d1d40 100644 (file)
--- a/src/cm.c
+++ b/src/cm.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

diff --git a/src/cmds.c b/src/cmds.c
index 19073dccf4a5130df776aad80b651b7f04066fe9..5b5c6de817ec3d64554745ca9e5057826887389b 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"

diff --git a/src/coding.c b/src/coding.c
index 405284f778b78788f4e9314d695edbc518cbccbf..678bafaa9ea238b50f3fdb900813336cb859d816 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -289,6 +289,7 @@ encode_coding_XXX (coding)
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/composite.c b/src/composite.c
index cd84f3932b05ed2ebc87f75429c9a0456008efaa..a654b5e8088d7db704182c408cf178acd93b51bd 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/data.c b/src/data.c
index 96e29a6c28308a52184a5e9c43baa5fd46aee92c..6d469e161db262160c40595f02b3e6d17dd32732 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -22,6 +22,7 @@ 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 "puresize.h"
 #include "character.h"

diff --git a/src/dbusbind.c b/src/dbusbind.c
index f4a5c6887d8fe5d187e4e999fed6af07b81f2a1f..86ec866ac6a8a10514310d1c775e315f5a76e188 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <stdio.h>
 #include <dbus/dbus.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "frame.h"
 #include "termhooks.h"

diff --git a/src/dired.c b/src/dired.c
index 10d8782d02346973381a54660ee039c61f7a1aeb..67002d32eb73d4bebab2e25d4b3588b958f6aeaf 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/src/dispnew.c b/src/dispnew.c
index e43a1a9869e7a4a94c5cd582e9b52c03dc4b7883..ba50b001980c6220d8732d979590cb75dda2c56c 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/doc.c b/src/doc.c
index 71308e6904f48e5a067a08bb9fa601591494d8e9..6a53e0d3f747a32ca7a4090e34b876be41e8e5a8 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 #include <sys/file.h>  /* Must be after sys/types.h for USG*/
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

diff --git a/src/doprnt.c b/src/doprnt.c
index 95d6b789c4f08c7c3b6b4a9fc9c6da973fc0650c..2d5b893dd200ff45aef9d35ce7c960a5604fea44 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef STDC_HEADERS
 #include <float.h>

diff --git a/src/dosfns.c b/src/dosfns.c
index 62594f1671ff2f4f2e0de4f0fc7be7c74c438eaf..30daed3077a35bae1bf1413c177683e2c502f1a1 100644 (file)
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <string.h>
 #include <dos.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "termchar.h"

diff --git a/src/editfns.c b/src/editfns.c
index 859e396582466db37d420ac6b6db3c8d52e8fc9d..8dfea1f595c569cba1b64f2de32c052de16a8119 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <sys/types.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/src/emacs.c b/src/emacs.c
index 1afcd08fb68fb0d294e577a4f027523dbf761467..2724aeefd489373ac20eaef976214f6584264eb5 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <sys/file.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/eval.c b/src/eval.c
index 20988392e5fa918d5a657f520dcde922fd0e43b4..4611731a65e4e72bffb2ddcc5d9d8a41d5ed3906 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -20,12 +20,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"
 #include "commands.h"
 #include "keyboard.h"
 #include "dispextern.h"
-#include <setjmp.h>
 
 #if HAVE_X_WINDOWS
 #include "xterm.h"
@@ -49,41 +49,6 @@ struct backtrace
 
 struct backtrace *backtrace_list;
 
-/* This structure helps implement the `catch' and `throw' control
-   structure.  A struct catchtag contains all the information needed
-   to restore the state of the interpreter after a non-local jump.
-
-   Handlers for error conditions (represented by `struct handler'
-   structures) just point to a catch tag to do the cleanup required
-   for their jumps.
-
-   catchtag structures are chained together in the C calling stack;
-   the `next' member points to the next outer catchtag.
-
-   A call like (throw TAG VAL) searches for a catchtag whose `tag'
-   member is TAG, and then unbinds to it.  The `val' member is used to
-   hold VAL while the stack is unwound; `val' is returned as the value
-   of the catch form.
-
-   All the other members are concerned with restoring the interpreter
-   state.  */
-
-struct catchtag
-{
-  Lisp_Object tag;
-  Lisp_Object val;
-  struct catchtag *next;
-  struct gcpro *gcpro;
-  jmp_buf jmp;
-  struct backtrace *backlist;
-  struct handler *handlerlist;
-  int lisp_eval_depth;
-  int pdlcount;
-  int poll_suppress_count;
-  int interrupt_input_blocked;
-  struct byte_stack *byte_stack;
-};
-
 struct catchtag *catchlist;
 
 #ifdef DEBUG_GCPRO

diff --git a/src/fileio.c b/src/fileio.c
index cfe1f54382e9e4337dd2215d84288f99de0e6c99..b83ef6fe45cf2d39ac4d2e33802acb99a3c0030c 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/filelock.c b/src/filelock.c
index c845a804ae3c033a6a39c79c39d9c513864713d9..bed0057dcbdf128439367f5e47753ce747ad52c0 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/src/floatfns.c b/src/floatfns.c
index 15077efae6cb18d4dcad8d6fdebfbecf29db7cc0..5aaf5f7badba1c7454a9a90851bfb9e0210eac61 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -48,6 +48,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <signal.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "syssignal.h"
 

diff --git a/src/fns.c b/src/fns.c
index e1431251e2494edc296a1d0860417a52e51d4aef..be5d9a9b43e29ac324b5086e6d5b393f4f652535 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #endif
 #include <time.h>
+#include <setjmp.h>
 
 /* Note on some machines this defines `vector' as a typedef,
    so make sure we don't use that name in this file.  */

diff --git a/src/font.c b/src/font.c
index 2e5db2d8f10a1cf7fc6f20ae3977002b6b65c86f..6e33b9bec554b361d1ce3a5a9b6ab3417a965f25 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/fontset.c b/src/fontset.c
index 35e186b3c3b2b4d9c0cd49c7dd86d6617acf17ea..cba84dc245816780a1b9893b0018a4f1a6668634 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "blockinput.h"

diff --git a/src/frame.c b/src/frame.c
index 47e084eb896495d6e1e359add7615151200c4c37..a66d4dd57eb1b1173864b49a3994e7199aa67b05 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #ifdef HAVE_X_WINDOWS

diff --git a/src/fringe.c b/src/fringe.c
index 41fc24d1150f748b1e0439b70958de595932e6cc..df62bee0edca0a8f62f377844ab1184137f2eea8 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

diff --git a/src/ftfont.c b/src/ftfont.c
index 367b796a212b934bdd630d043780e8ab29368d2d..ed9cb6f19d26da75470f102a3b853102d91920a7 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>

diff --git a/src/ftxfont.c b/src/ftxfont.c
index 2cf45bb27a09d6896a65bdb7d97b6cc677af323e..1f97a94e94ff21085fc2a7c542730320818878dc 100644 (file)
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 
 #include "lisp.h"

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 9da2c7e9cbe82bce1a6000203e3f1b23b009bc92..8aa877a8f83c3308a8752b725881c21c9db7efbe 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <string.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "xterm.h"
 #include "blockinput.h"

diff --git a/src/image.c b/src/image.c
index fa4eecd040b7ea6453ff6afa5710bbe4a1182ac8..d35bd83e6a49933d5f752211435eb254898f10ec 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -27,6 +27,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_PNG
+#if defined HAVE_LIBPNG_PNG_H
+# include <libpng/png.h>
+#else
+# include <png.h>
+#endif
+#endif 
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS
@@ -5787,12 +5795,6 @@ png_image_p (object)
 
 #ifdef HAVE_PNG
 
-#if defined HAVE_LIBPNG_PNG_H
-# include <libpng/png.h>
-#else
-# include <png.h>
-#endif
-
 #ifdef HAVE_NTGUI
 /* PNG library details.  */
 

diff --git a/src/indent.c b/src/indent.c
index f10b235427e3a7763543588d4aca0b4fec3ac911..5a73fa1b211e080663fe180e2c169b99bb04df8c 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/insdel.c b/src/insdel.c
index b09bed66d553d82379eba04d673282003fca62ec..2790116484287bae450ea715486af0cbc905563a 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -20,6 +20,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 "buffer.h"

diff --git a/src/intervals.c b/src/intervals.c
index ee18dd5b4bef24ddd6c60604bcee209dcd82ec91..bb6023337f261bcb06fa609ef1d32fa1dfb46841 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -39,6 +39,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 "buffer.h"

diff --git a/src/keyboard.c b/src/keyboard.c
index 396f22fa7a127917f59f5182eb7e9d45aa130d68..de4e1c5647e67a586b9332b6c5e1f0caac8c39d7 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -21,6 +21,7 @@ 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 "termchar.h"
 #include "termopts.h"

diff --git a/src/keymap.c b/src/keymap.c
index e4f68d386de78888117468c9b960294432ff8854..d050191dc4e246fcef6ffe54985ff4da821be0e9 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #if HAVE_ALLOCA_H
 # include <alloca.h>
 #endif

diff --git a/src/lisp.h b/src/lisp.h
index 6751898e16315e59253429e8ff62b904bc95c35a..4685578a417d2b9fa054b49e72aedc412a568816 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1826,6 +1826,41 @@ struct handler
 
 extern struct handler *handlerlist;
 
+/* This structure helps implement the `catch' and `throw' control
+   structure.  A struct catchtag contains all the information needed
+   to restore the state of the interpreter after a non-local jump.
+
+   Handlers for error conditions (represented by `struct handler'
+   structures) just point to a catch tag to do the cleanup required
+   for their jumps.
+
+   catchtag structures are chained together in the C calling stack;
+   the `next' member points to the next outer catchtag.
+
+   A call like (throw TAG VAL) searches for a catchtag whose `tag'
+   member is TAG, and then unbinds to it.  The `val' member is used to
+   hold VAL while the stack is unwound; `val' is returned as the value
+   of the catch form.
+
+   All the other members are concerned with restoring the interpreter
+   state.  */
+
+struct catchtag
+{
+  Lisp_Object tag;
+  Lisp_Object val;
+  struct catchtag *next;
+  struct gcpro *gcpro;
+  jmp_buf jmp;
+  struct backtrace *backlist;
+  struct handler *handlerlist;
+  int lisp_eval_depth;
+  int pdlcount;
+  int poll_suppress_count;
+  int interrupt_input_blocked;
+  struct byte_stack *byte_stack;
+};
+
 extern struct catchtag *catchlist;
 extern struct backtrace *backtrace_list;
 

diff --git a/src/macros.c b/src/macros.c
index c6ae0defa630a2dc1c8148608472010543ffba2c..0d69b9203cf9fb52ee33bc4fa79ad3df97bb82a4 100644 (file)
--- a/src/macros.c
+++ b/src/macros.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "macros.h"
 #include "commands.h"

diff --git a/src/marker.c b/src/marker.c
index dbaaf872c2c65a0fa1af4245e8a480b304e5b168..fd2b8b91087678ff8723d47c84096e12fc6b0c59 100644 (file)
--- a/src/marker.c
+++ b/src/marker.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/menu.c b/src/menu.c
index 5331cbc31448e7489e8cbc055d410b9e39ac08bb..74d455a8c0ab5c0ceff507638be96e2bce1f2b99 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

diff --git a/src/minibuf.c b/src/minibuf.c
index 138581fb835eaa350976956cc525354a6f943c3c..fc876370a2d1e4aeb3fa227c27055df372043f8c 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "commands.h"

diff --git a/src/msdos.c b/src/msdos.c
index 9783e8ce16aa0148f54e5f1e6c9efe8203a82049..b6820b50f2c3f73f77ed3f1569bdc4b59db4fac3 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #ifdef MSDOS
+#include <setjmp.h>
 #include "lisp.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/print.c b/src/print.c
index 5eee386cab76931d7552ad0e3772c1386bdb60e8..f90ec27a0a41dc5da6ee5996efe953b10512a4b4 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

diff --git a/src/process.c b/src/process.c
index 99f57d35d4ae3692a17e6d9cd11732380f5b827a..b405f1ef6903193658f5329a0c915012ce5538c2 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -38,6 +38,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>         /* some typedefs are used in sys/file.h */
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
@@ -7641,6 +7642,7 @@ The variable takes effect when `start-process' is called.  */);
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <setjmp.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/ralloc.c b/src/ralloc.c
index f5ebb8449ca57374d50f399803f9475807c96792..6faee2cac898752901bb9d0fb8485d1bf379cdc4 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef emacs
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"              /* Needed for VALBITS.  */
 #include "blockinput.h"
 

diff --git a/src/regex.c b/src/regex.c
index 0c9e137aca0d50a781c5a8fa3a5ddb92c52131c1..ac7b7510a6744a1d71bfab98b6163efcbb3df4d8 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -117,6 +117,7 @@
    that make sense only in Emacs. */
 #ifdef emacs
 
+# include <setjmp.h>
 # include "lisp.h"
 # include "buffer.h"
 

diff --git a/src/region-cache.c b/src/region-cache.c
index 1f1df5fc168daacad7872b013bf5ec03a2def5e5..22caf6ebf0d262fa62e24efe6c1f09c00df835bf 100644 (file)
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/scroll.c b/src/scroll.c
index 4d57a2a9b8bd838d4b7c037dc420181a8022aa99..c7c2630403b90778f527ad7b6aa716263bc83596 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "termchar.h"
 #include "dispextern.h"

diff --git a/src/search.c b/src/search.c
index e6ae4b660b6154d28cc27384e61b732735522eb6..8bfe61d5f6d851c1310adca5deb27f43696c8a19 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "syntax.h"
 #include "category.h"

diff --git a/src/sheap.c b/src/sheap.c
index 96511e68f45ad8fe18ee4bb21a03a7149cfc07c6..5e327764efe779d15f3fb313d925d4b85eb1640d 100644 (file)
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 
 #include <unistd.h>

diff --git a/src/sound.c b/src/sound.c
index 58a8a9c46539d0a05ca0dc134f59531d7f4b53e8..6f1f5385978e144dcac48879069a57f7918c9056 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -44,6 +44,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "dispextern.h"
 #include "atimer.h"

diff --git a/src/syntax.c b/src/syntax.c
index 3c5a21de5c77df939bb4aa4115491b9856d9d213..048f0ee66379255d355e2b6beb0aeb9c71feffaf 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"

diff --git a/src/term.c b/src/term.c
index 9e18df3160ebe5a3a7b5bed4db4bbf681e0dd8de..d860a9323577262b7311999c13f7d5002510f0ea 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -37,6 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 #include <stdarg.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "termchar.h"

diff --git a/src/termcap.c b/src/termcap.c
index 2ad31d7b96abc0be16cc71245416d4aca378e471..46254c67c1c1a3b04921a0aac675228a5085ddfd 100644 (file)
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 
 #ifdef emacs
 
+#include <setjmp.h>
 #include <lisp.h>              /* xmalloc is here */
 /* Get the O_* definitions for open et al.  */
 #include <sys/file.h>

diff --git a/src/terminal.c b/src/terminal.c
index d9951dba464bd176f71697ae9e9c9c56c3098599..c89f2e600058edb7d41903682aab72f8335511cb 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -18,6 +18,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

diff --git a/src/terminfo.c b/src/terminfo.c
index 9b6b76b9f7fb80c3d9b8223c745e27147104ce4c..03187c65e8fe3bbcf765bc638294d5d4c03a1dd6 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 
 /* Define these variables that serve as global parameters to termcap,

diff --git a/src/textprop.c b/src/textprop.c
index 0018088b63eb153e2857caa9678003f3763c0450..e82af12d90a4421b1fe281be4cd2335fc0b50536 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 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 "buffer.h"

diff --git a/src/tparam.c b/src/tparam.c
index dabf0ed9713fc8deb21fdef8fd9b04710fae90f6..dcf79a3b61714f2d7c173bf8851500998c437af2 100644 (file)
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifdef emacs
+#include <setjmp.h>
 #include "lisp.h"              /* for xmalloc */
 #else
 

diff --git a/src/undo.c b/src/undo.c
index 39ca983b76e3294266f2447f948d38bf5658334e..f2a37cb4083e3bc4dea1e4263ec1a879e347ad5f 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "commands.h"

diff --git a/src/unexaix.c b/src/unexaix.c
index c224a3626fec3e4b75674df9ac306d381f9a4565..5f61b5a03d2176c52523d94ebc61039488360ca1 100644 (file)
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -104,6 +104,7 @@ static int adjust_lnnoptrs (int, int, char *);
 static int pagemask;
 
 #ifdef emacs
+#include <setjmp.h>
 #include "lisp.h"
 
 static void

diff --git a/src/unexcw.c b/src/unexcw.c
index a7f4b6b2cf6cf060da70a381adb28cf3f2111aa5..1e65d65007bda208e520ef00aeee51364dd27789 100644 (file)
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include <lisp.h>
 #include <stdio.h>
 #include <fcntl.h>

diff --git a/src/unexec.c b/src/unexec.c
index a6852af7d07ebfab953116b5666720201687e2b2..c655583e30626dd1ca58782d9a260f345ec36d4f 100644 (file)
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -204,6 +204,7 @@ static int pagemask;
 
 #ifdef emacs
 
+#include <setjmp.h>
 #include "lisp.h"
 
 static

diff --git a/src/unexsol.c b/src/unexsol.c
index 9f919faedc0cbdf9befe6ea5a7ac419012747702..04e3f40799c1304652eb6550bd3b9f6a87c4b71c 100644 (file)
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -3,6 +3,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <dlfcn.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/vm-limit.c b/src/vm-limit.c
index 5abf048913a30166a84c15d9a65ad5298b09a72e..06e99c638dd22b12b919d319cec4b1f49a4a25eb 100644 (file)
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef emacs
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #endif
 

diff --git a/src/w16select.c b/src/w16select.c
index 91ce8f13f1cb4858a1da59a04c6b753f56f17a12..4d2476030e5303b487a51c35ece4f0965953f42c 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -32,6 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <dpmi.h>
 #include <go32.h>
 #include <sys/farptr.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "dispextern.h"        /* frame.h seems to want this */
 #include "frame.h"     /* Need this to get the X window of selected_frame */

diff --git a/src/w32.c b/src/w32.c
index e8b7abc082ee2dd029cb22fdd087da73533c03cc..786f8e2a848ee9104fa81a775f78c19d7c75f02b 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -34,6 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/utime.h>
 #include <mbstring.h>  /* for _mbspbrk */
 #include <math.h>
+#include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
 

diff --git a/src/w32console.c b/src/w32console.c
index 947ff7554fc4b515311f579f71ce18323a16b8d7..6b96c05b2ebd338bfcb6f60d66c40e8d0bd409a9 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -29,6 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <windows.h>
 #include <string.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

diff --git a/src/w32fns.c b/src/w32fns.c
index 8003d7917191e73e945fcb4c921333cca8135e85..c06fa4ea9d4c25d4cb8f18ed334ea969ed55e2f6 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -27,6 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <limits.h>
 #include <errno.h>
 #include <math.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

diff --git a/src/w32font.c b/src/w32font.c
index 995500aa0e401b37409892e8b076cb6400e8e479..69462512ca3579b262e23ea0d56cf148f71d5154 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <math.h>
 #include <ctype.h>
 #include <commdlg.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

diff --git a/src/w32heap.c b/src/w32heap.c
index efdcdfa71070d255c31d26bcdb558e65c1f30339..408917dda1a6d4ca5727ac5602bcb307b8987966 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -27,6 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */

diff --git a/src/w32inevt.c b/src/w32inevt.c
index ac7ca644c54a59126d31826774c82eb886d1ef4b..960e14de2a935d13f8bc4c16764c843e8538c38c 100644 (file)
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <stdio.h>
 #include <windows.h>
+#include <setjmp.h>
 
 #ifndef MOUSE_MOVED
 #define MOUSE_MOVED   1

diff --git a/src/w32menu.c b/src/w32menu.c
index 677de1b180a1ec9666df784c5906080678a7fbf4..c573e3713ca481f59a312929f036e0151e4c74e4 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 #include <stdio.h>
 #include <mbstring.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

diff --git a/src/w32proc.c b/src/w32proc.c
index 40829f0d63e6eccdb31aad0e7df36b84ed88e161..ab5c91f679e5bf5b302ed4e1b05b4df79519438e 100644 (file)
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -29,6 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/file.h>
+#include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
 

diff --git a/src/w32reg.c b/src/w32reg.c
index 2b5b352c58337268dce3fba1a6cd28911478dfef..94f5196ea8dd0f7eea599cd30b062143b9e7657c 100644 (file)
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Written by Kevin Gallo */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"
 #include "blockinput.h"

diff --git a/src/w32select.c b/src/w32select.c
index ce93b544126040abb13f67d48b0a318364c609a9..9c67fabceec4aa883bb3d7111927f2de84d9a7ac 100644 (file)
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -73,6 +73,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
  
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"   /* for all of the w32 includes */
 #include "w32heap.h"   /* os_subtype */

diff --git a/src/w32term.c b/src/w32term.c
index b7642b46891e1f6a9422750c225b929f11c8bb39..008042c810a9e171d44cbb78d6847d7b8c387b53 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"
 #include "w32term.h"

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 9e75b671616f95e2e68cc65d1ad8928943a944a8..2cb55d4c702fd437ba1be390764ba813ce951e41 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -27,6 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define _WIN32_WINNT 0x500
 #include <windows.h>
 #include <usp10.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

diff --git a/src/w32xfns.c b/src/w32xfns.c
index 5bf39967e85b91a236cbf6452a25a1110ba1e394..37ec500d5549406162246c0d799d8deec56e5868 100644 (file)
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -20,6 +20,7 @@ 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"
 #include "frame.h"

diff --git a/src/widget.c b/src/widget.c
index 91072c40acdacc7af9ba90ccc567561fe07b3820..32b3649be5d3d1da50620db606d7eca7a2f3004f 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -31,6 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "xterm.h"
 

diff --git a/src/window.c b/src/window.c
index 9b50a85b0ca021eab112c06d87a4a69987c8cf86..4630b6dd90b38ba0d6353aa4d0a6092d1ec76b42 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

diff --git a/src/xdisp.c b/src/xdisp.c
index a750a1b73b5e3315207cc2382d663a991a6ce5c1..f88750447aa25ede180a650b3dc38242f3328f88 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -168,6 +168,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <limits.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

diff --git a/src/xfaces.c b/src/xfaces.c
index 4f808e41beb214907a5f4f62b9eb62e13406d407..f120dfcbb54ec5e3fd2f60110b0f829200c0bbed 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -204,6 +204,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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"

diff --git a/src/xfns.c b/src/xfns.c
index 87ff21b7759182c98ea2ad1054dbc7dd72ae42ee..4fc08925ebb09864a6f4d82aefe9303d7994e06f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <math.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/xfont.c b/src/xfont.c
index 7db7cae5c65b5ba5a51477c3abb45ad6ae9a7a7f..36ac09fcb18b55412d35ca41be5b4b331e319aa2 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 
 #include "lisp.h"

diff --git a/src/xftfont.c b/src/xftfont.c
index 2b576c3d4a2c73a5ed223155a0af73e0e4b74baa..e66b538fa157231f50afd3dbc757a9a81252b0d6 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 

diff --git a/src/xmenu.c b/src/xmenu.c
index c6d7b0d95852428980d0852a9ffd9d1d3b87eef7..f899ddaa6315b1164b5ecad21f55497ddcd94ed4 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -37,6 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

diff --git a/src/xrdb.c b/src/xrdb.c
index fac97e4350f6af228967b995d1681ea114daeadc..3ae7068e479a0b0366ea2a5e25e8a051416921bd 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -31,6 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <epaths.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #if 1 /* I'd really appreciate it if this code could go away...  -JimB */
 /* This avoids lossage in the `dual-universe' headers on AT&T SysV

diff --git a/src/xselect.c b/src/xselect.c
index 5cf4f74602c1168a455ad4d8ba1200b17abfe3b8..79e0c0a280b8aa045e856e099c3e90225e548a88 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>      /* termhooks.h needs this */
+#include <setjmp.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/src/xsmfns.c b/src/xsmfns.c
index 80c4802a496ff993a03d78187df528c72f1658b1..3e8220bd40648e70ad45af6562342bbeba77cebd 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -32,6 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/param.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "systime.h"

diff --git a/src/xterm.c b/src/xterm.c
index 72aea94e8b394ac69b884f76994d0496aa02a156..c77136eb64aa956b18a04970fc5c27831ddd0b98 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_X_WINDOWS