User: ben
Date: 05/01/31 20:29:51
Modified: xemacs/src ChangeLog emacs.c lisp.h
Log:
define ABORT always
emacs.c: Define assert_failed() always.
lisp.h: Always define ABORT().
Revision Changes Path
1.782 +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.781
retrieving revision 1.782
diff -u -b -r1.781 -r1.782
--- ChangeLog 2005/01/29 09:15:55 1.781
+++ ChangeLog 2005/01/31 19:29:47 1.782
@@ -1,3 +1,10 @@
+2005-01-31 Ben Wing <ben(a)xemacs.org>
+
+ * emacs.c:
+ Define assert_failed() always.
+ * lisp.h:
+ Always define ABORT().
+
2005-01-29 Ben Wing <ben(a)xemacs.org>
* alloc.c (garbage_collect_1):
1.154 +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.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- emacs.c 2005/01/28 02:36:24 1.153
+++ emacs.c 2005/01/31 19:29:48 1.154
@@ -3796,7 +3796,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. */
/* Nonzero if handling an assertion failure. (Bumped by one each time
@@ -3896,7 +3895,6 @@
inhibit_non_essential_conversion_operations = 0;
in_assert_failed = 0;
}
-#endif /* USE_ASSERTIONS */
/* -------------------------------------- */
/* low-memory notification */
1.122 +11 -12 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.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- lisp.h 2005/01/29 09:15:59 1.121
+++ lisp.h 2005/01/31 19:29:49 1.122
@@ -1,7 +1,7 @@
/* Fundamental definitions for XEmacs Lisp interpreter.
Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc.
Copyright (C) 1993-1996 Richard Mlynarik.
- Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004 Ben Wing.
+ Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing.
This file is part of XEmacs.
@@ -1040,26 +1040,25 @@
from error-checking macros. If we're not tricky, we just get the file
and line of the inline function, which is not very useful. */
-#ifdef USE_ASSERTIONS
/* Highly dubious kludge */
/* (thanks, Jamie, I feel better now -- ben) */
MODULE_API void assert_failed (const Ascbyte *, int, const Ascbyte *);
-# define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()"))
+#define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()"))
+
+#ifdef USE_ASSERTIONS
# define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
# define assert_with_message(x, msg) \
((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, msg))
# define assert_at_line(x, file, line) \
((x) ? (void) 0 : assert_failed (file, line, #x))
-#else
-# ifdef DEBUG_XEMACS
+#elif defined (DEBUG_XEMACS)
# define assert(x) ((x) ? (void) 0 : (void) ABORT ())
# define assert_with_message(x, msg) ((x) ? (void) 0 : (void) ABORT ())
# define assert_at_line(x, file, line) assert (x)
-# else
+#else
# define assert(x) ((void) 0)
# define assert_with_message(x, msg)
# define assert_at_line(x, file, line) assert (x)
-# endif
#endif
/************************************************************************/