User: vins Date: 05/02/01 04:55:09 Modified: xemacs/src Tag: release-21-4 ChangeLog emacs.c lisp.h Log: Fix non-debug native Windows builds. Revision Changes Path No revision No revision 1.290.2.92 +7 -0 XEmacs/xemacs/src/ChangeLog (In the diff below, changes in quantity of whitespace are not shown.) Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.91 retrieving revision 1.290.2.92 diff -u -b -r1.290.2.91 -r1.290.2.92 --- ChangeLog 2005/01/31 02:54:58 1.290.2.91 +++ ChangeLog 2005/02/01 03:54:57 1.290.2.92 ＠＠ -1,3 +1,10 ＠＠ +2005-01-31 Ben Wing <ben(a)xemacs.org&gt; + + * emacs.c: + Define assert_failed() always. + * lisp.h: + Always define ABORT(). + 2005-01-25 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in: 1.97.2.10 +0 -2 XEmacs/xemacs/src/emacs.c (In the diff below, changes in quantity of whitespace are not shown.) Index: emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.97.2.9 retrieving revision 1.97.2.10 diff -u -b -r1.97.2.9 -r1.97.2.10 --- emacs.c 2005/01/31 02:55:09 1.97.2.9 +++ emacs.c 2005/02/01 03:55:01 1.97.2.10 ＠＠ -3356,7 +3356,6 ＠＠ 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 ＠＠ inhibit_non_essential_printing_operations = 0; in_assert_failed = 0; } -#endif /* USE_ASSERTIONS */ #ifdef QUANTIFY DEFUN ("quantify-start-recording-data", Fquantify_start_recording_data, 1.45.2.10 +3 -2 XEmacs/xemacs/src/lisp.h (In the diff below, changes in quantity of whitespace are not shown.) Index: lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.45.2.9 retrieving revision 1.45.2.10 diff -u -b -r1.45.2.9 -r1.45.2.10 --- lisp.h 2005/01/31 02:55:21 1.45.2.9 +++ lisp.h 2005/02/01 03:55:02 1.45.2.10 ＠＠ -243,11 +243,12 ＠＠ 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