XEmacs 21.4.17 "Jumbo Shrimp".

[chise/xemacs-chise.git.1] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index 2a9cacb..9c9caa6 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -243,15 +243,16 @@ template<typename T> struct alignment_trick { char c; T member; };
    time the assert checks take is measurable so let's not include them
    in production binaries. */
 
    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) */
 /* Highly dubious kludge */
 /*   (thanks, Jamie, I feel better now -- ben) */

+# define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()"))

 void assert_failed (const char *, int, const char *);
 void assert_failed (const char *, int, const char *);

-# define abort() (assert_failed (__FILE__, __LINE__, "abort()"))
+
+#ifdef USE_ASSERTIONS

 # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
 #else
 # ifdef DEBUG_XEMACS
 # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
 #else
 # ifdef DEBUG_XEMACS

-#  define assert(x) ((x) ? (void) 0 : (void) abort ())
+#  define assert(x) ((x) ? (void) 0 : (void) ABORT ())

 # else
 #  define assert(x)
 # endif
 # else
 #  define assert(x)
 # endif

@@ -879,7 +880,7 @@ do {                                                                        \
 
 /* For a list that's known to be in valid list format, where we may
    be deleting the current element out of the list --
 
 /* For a list that's known to be in valid list format, where we may
    be deleting the current element out of the list --

-   will abort() if the list is not in valid format */
+   will ABORT() if the list is not in valid format */

 #define LIST_LOOP_DELETING(consvar, nextconsvar, list)         \
   for (consvar = list;                                         \
        !NILP (consvar) ? (nextconsvar = XCDR (consvar), 1) :0; \
 #define LIST_LOOP_DELETING(consvar, nextconsvar, list)         \
   for (consvar = list;                                         \
        !NILP (consvar) ? (nextconsvar = XCDR (consvar), 1) :0; \

@@ -1410,7 +1411,7 @@ DECLARE_LRECORD (marker, Lisp_Marker);
 #define CONCHECK_MARKER(x) CONCHECK_RECORD (x, marker)
 
 /* The second check was looking for GCed markers still in use */
 #define CONCHECK_MARKER(x) CONCHECK_RECORD (x, marker)
 
 /* The second check was looking for GCed markers still in use */

-/* if (INTP (XMARKER (x)->lheader.next.v)) abort (); */
+/* if (INTP (XMARKER (x)->lheader.next.v)) ABORT (); */

 
 #define marker_next(m) ((m)->next)
 #define marker_prev(m) ((m)->prev)
 
 #define marker_next(m) ((m)->next)
 #define marker_prev(m) ((m)->prev)