src/ChangeLog addition: 2005-01-31 Ben Wing <ben(a)xemacs.org&gt; * emacs.c: Define assert_failed() always. * lisp.h: Always define ABORT(). latest-stable source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/lisp.h src/emacs.c Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.97.2.9 diff -u -p -r1.97.2.9 emacs.c --- src/emacs.c 2005/01/31 02:55:09 1.97.2.9 +++ src/emacs.c 2005/01/31 19:33:09 ＠＠ -3356,7 +3356,6 ＠＠ Non-nil return value means XEmacs is run in one session without having to recompile. */ /* #define ASSERTIONS_DONT_ABORT */ -#ifdef USE_ASSERTIONS /* This highly dubious kludge ... shut up Jamie, I'm tired of your slagging. */ static int in_assert_failed; ＠＠ -3429,7 +3428,6 ＠＠ assert_failed (const char *file, int lin inhibit_non_essential_printing_operations = 0; in_assert_failed = 0; } -#endif /* USE_ASSERTIONS */ #ifdef QUANTIFY DEFUN ("quantify-start-recording-data", Fquantify_start_recording_data, Index: src/lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.45.2.9 diff -u -p -r1.45.2.9 lisp.h --- src/lisp.h 2005/01/31 02:55:21 1.45.2.9 +++ src/lisp.h 2005/01/31 19:33:11 ＠＠ -243,11 +243,12 ＠＠ template<typename T> struct alignment_tr time the assert checks take is measurable so let's not include them in production binaries. */ -#ifdef USE_ASSERTIONS /* Highly dubious kludge */ /* (thanks, Jamie, I feel better now -- ben) */ -void assert_failed (const char *, int, const char *); # define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()")) +void assert_failed (const char *, int, const char *); + +#ifdef USE_ASSERTIONS # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x)) #else # ifdef DEBUG_XEMACS