diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bytecode.c | 2 | ||||
| -rw-r--r-- | src/menu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index e2d8ab706c7..be39a81c5e9 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -46,7 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ indirect threaded, using GCC's computed goto extension. This code, as currently implemented, is incompatible with BYTE_CODE_SAFE and BYTE_CODE_METER. */ -#if (defined __GNUC__ && !defined __STRICT_ANSI__ \ +#if (defined __GNUC__ && !defined __STRICT_ANSI__ && !defined __CHKP__ \ && !BYTE_CODE_SAFE && !defined BYTE_CODE_METER) #define BYTE_CODE_THREADED #endif diff --git a/src/menu.c b/src/menu.c index 638810b36f8..80709679513 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1540,7 +1540,7 @@ for instance using the window manager, then this produces a quit and /* Note that xw_popup_dialog can call menu code, so Vmenu_updating_frame should be set (Bug#17891). */ - eassert (f && FRAME_LIVE_P (f)); + eassume (f && FRAME_LIVE_P (f)); XSETFRAME (Vmenu_updating_frame, f); /* Force a redisplay before showing the dialog. If a frame is created |