[Emacs-diffs] /srv/bzr/emacs/trunk r110036: Fix MS-Windows build broken by revision 110035, completing fix for bug #12446.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110036
fixes bug: http://debbugs.gnu.org/12446
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-15 11:03:11 +0300
message:
  Fix MS-Windows build broken by revision 110035, completing fix for bug #12446.
  
   src/w32xfns.c:
   src/w32uniscribe.c:
   src/w32term.c:
   src/w32select.c:
   src/w32reg.c:
   src/w32proc.c:
   src/w32menu.c:
   src/w32inevt.c:
   src/w32heap.c:
   src/w32font.c:
   src/w32fns.c:
   src/w32console.c:
   src/w32.c:
   src/w16select.c: Remove inclusion of setjmp.h, as it is now included
   by lisp.h.  This completes removal of setjmp.h inclusion
   erroneously announced in the previous commit.
   src/lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
   more accurate.
   src/image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
   not defined as a macro.  The latter happens on MS-Windows.
modified:
  src/ChangeLog
  src/image.c
  src/lisp.h
  src/w16select.c
  src/w32.c
  src/w32console.c
  src/w32fns.c
  src/w32font.c
  src/w32heap.c
  src/w32inevt.c
  src/w32menu.c
  src/w32proc.c
  src/w32reg.c
  src/w32select.c
  src/w32term.c
  src/w32uniscribe.c
  src/w32xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-15 07:06:56 +0000
+++ b/src/ChangeLog     2012-09-15 08:03:11 +0000
@@ -1,8 +1,34 @@
+2012-09-15  Eli Zaretskii  <address@hidden>
+
+       * 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: Remove inclusion of setjmp.h, as it is now included
+       by lisp.h.  This completes removal of setjmp.h inclusion
+       erroneously announced in the previous commit.  (Bug#12446)
+
+       * lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
+       more accurate.
+
+       * image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
+       not defined as a macro.  The latter happens on MS-Windows.
+       (Bug#12446)
+
 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
+       Some 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,

=== modified file 'src/image.c'
--- a/src/image.c       2012-09-15 07:06:56 +0000
+++ b/src/image.c       2012-09-15 08:03:11 +0000
@@ -5516,9 +5516,13 @@
 
 /* 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.  */
+   substitute may munge the signal mask, but that should be OK here.
+   MinGW (MS-Windows) uses _setjmp and defines setjmp to _setjmp in
+   the system header setjmp.h; don't mess up that.  */
 #ifndef HAVE__SETJMP
-# define _setjmp(j) setjmp (j)
+# ifndef setjmp
+#  define _setjmp(j) setjmp (j)
+# endif
 # define _longjmp longjmp
 #endif
 

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-09-15 07:06:56 +0000
+++ b/src/lisp.h        2012-09-15 08:03:11 +0000
@@ -1977,7 +1977,8 @@
 # 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.  */
+/* A platform that uses neither _longjmp nor siglongjmp; 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)

=== modified file 'src/w16select.c'
--- a/src/w16select.c   2012-07-05 06:32:41 +0000
+++ b/src/w16select.c   2012-09-15 08:03:11 +0000
@@ -31,7 +31,6 @@
 #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 */

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-09-07 08:20:07 +0000
+++ b/src/w32.c 2012-09-15 08:03:11 +0000
@@ -33,7 +33,6 @@
 #include <sys/utime.h>
 #include <mbstring.h>  /* for _mbspbrk */
 #include <math.h>
-#include <setjmp.h>
 #include <time.h>
 
 /* must include CRT headers *before* config.h */

=== modified file 'src/w32console.c'
--- a/src/w32console.c  2012-07-29 08:18:29 +0000
+++ b/src/w32console.c  2012-09-15 08:03:11 +0000
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <windows.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-09-04 17:34:54 +0000
+++ b/src/w32fns.c      2012-09-15 08:03:11 +0000
@@ -26,7 +26,6 @@
 #include <limits.h>
 #include <errno.h>
 #include <math.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2012-09-06 08:04:49 +0000
+++ b/src/w32font.c     2012-09-15 08:03:11 +0000
@@ -21,7 +21,6 @@
 #include <math.h>
 #include <ctype.h>
 #include <commdlg.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2012-07-29 16:22:27 +0000
+++ b/src/w32heap.c     2012-09-15 08:03:11 +0000
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <setjmp.h>
 
 #include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2012-07-30 17:07:33 +0000
+++ b/src/w32inevt.c    2012-09-15 08:03:11 +0000
@@ -25,7 +25,6 @@
 #include <config.h>
 #include <stdio.h>
 #include <windows.h>
-#include <setjmp.h>
 
 #ifndef MOUSE_MOVED
 #define MOUSE_MOVED   1

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-09-04 17:34:54 +0000
+++ b/src/w32menu.c     2012-09-15 08:03:11 +0000
@@ -22,7 +22,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <mbstring.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2012-09-12 19:14:02 +0000
+++ b/src/w32proc.c     2012-09-15 08:03:11 +0000
@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/file.h>
-#include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
 #include <config.h>

=== modified file 'src/w32reg.c'
--- a/src/w32reg.c      2012-07-05 06:32:41 +0000
+++ b/src/w32reg.c      2012-09-15 08:03:11 +0000
@@ -19,7 +19,6 @@
 /* Written by Kevin Gallo */
 
 #include <config.h>
-#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"
 #include "blockinput.h"

=== modified file 'src/w32select.c'
--- a/src/w32select.c   2012-09-04 17:34:54 +0000
+++ b/src/w32select.c   2012-09-15 08:03:11 +0000
@@ -73,7 +73,6 @@
  */
 
 #include <config.h>
-#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"   /* for all of the w32 includes */
 #include "w32heap.h"   /* os_subtype */

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2012-09-11 03:32:41 +0000
+++ b/src/w32term.c     2012-09-15 08:03:11 +0000
@@ -20,7 +20,6 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
-#include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"
 #include "w32term.h"

=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c        2012-09-04 17:15:45 +0000
+++ b/src/w32uniscribe.c        2012-09-15 08:03:11 +0000
@@ -27,7 +27,6 @@
 #define _WIN32_WINNT 0x500
 #include <windows.h>
 #include <usp10.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

=== modified file 'src/w32xfns.c'
--- a/src/w32xfns.c     2012-09-04 17:34:54 +0000
+++ b/src/w32xfns.c     2012-09-15 08:03:11 +0000
@@ -19,7 +19,6 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
-#include <setjmp.h>
 #include "lisp.h"
 #include "keyboard.h"
 #include "frame.h"