From cb341561afe600adb5af9450183a69eed2de7c90 Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Thu, 3 Jun 2004 03:09:01 +0000 Subject: [PATCH] Corrected a stupid mistake Modified the build system to make kernel-mode components use the SEH library's built-in setjmp/longjmp svn path=/trunk/; revision=9599 --- reactos/include/pseh/framebased.h | 6 +++--- reactos/tools/helper.mk | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/reactos/include/pseh/framebased.h b/reactos/include/pseh/framebased.h index 085550bfc4c..20725cd0b72 100644 --- a/reactos/include/pseh/framebased.h +++ b/reactos/include/pseh/framebased.h @@ -27,13 +27,13 @@ #include #ifdef _SEH_NO_NATIVE_NLG -#include -#include -#else #include #define longjmp _SEHLongJmp #define setjmp _SEHSetJmp #define jmp_buf _SEHJmpBuf_t +#else +#include +#include #endif typedef struct __SEHFrame diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk index 63ddc653dda..7bad4a6e9e9 100644 --- a/reactos/tools/helper.mk +++ b/reactos/tools/helper.mk @@ -1,4 +1,4 @@ -# $Id: helper.mk,v 1.65 2004/06/02 18:24:09 hyperion Exp $ +# $Id: helper.mk,v 1.66 2004/06/03 03:09:01 hyperion Exp $ # # Helper makefile for ReactOS modules # Variables this makefile accepts: @@ -583,6 +583,8 @@ endif ifeq ($(MK_MODE),kernel) MK_DEFBASE := 0x10000 MK_LIBS := $(addprefix $(DDK_PATH_LIB)/, $(TARGET_DDKLIBS) $(MK_DDKLIBS)) + MK_CFLAGS += -D_SEH_NO_NATIVE_NLG + MK_CPPFLAGS += -D_SEH_NO_NATIVE_NLG endif