diff options
| author | Eli Zaretskii | 2012-09-15 11:03:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-09-15 11:03:11 +0300 |
| commit | 7105c8cbf3a3226701e4d2ecb0b9c2d207648a98 (patch) | |
| tree | ea1d91884504460ebb6ac7cad3efabdc41d956e5 /src/w16select.c | |
| parent | 0328b6de4a92676b4ad4616095ce19a4f51d1c4d (diff) | |
| download | emacs-7105c8cbf3a3226701e4d2ecb0b9c2d207648a98.tar.gz emacs-7105c8cbf3a3226701e4d2ecb0b9c2d207648a98.zip | |
Fix MS-Windows build broken by 2012-09-15T07:06:56Z!eggert@cs.ucla.edu, 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.
Diffstat (limited to 'src/w16select.c')
| -rw-r--r-- | src/w16select.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/w16select.c b/src/w16select.c index 2026de7421d..a3f6f1fb9ae 100644 --- a/src/w16select.c +++ b/src/w16select.c | |||
| @@ -31,7 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | #include <dpmi.h> | 31 | #include <dpmi.h> |
| 32 | #include <go32.h> | 32 | #include <go32.h> |
| 33 | #include <sys/farptr.h> | 33 | #include <sys/farptr.h> |
| 34 | #include <setjmp.h> | ||
| 35 | #include "lisp.h" | 34 | #include "lisp.h" |
| 36 | #include "dispextern.h" /* frame.h seems to want this */ | 35 | #include "dispextern.h" /* frame.h seems to want this */ |
| 37 | #include "frame.h" /* Need this to get the X window of selected_frame */ | 36 | #include "frame.h" /* Need this to get the X window of selected_frame */ |