# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265719797 21600
# Node ID 4e784bfabae7dc13446285074889d5c2e8498076
# Parent  eadd99984bfb12198be9b4d72639101221feafb8
fix bad defn of disabled inline assert

-------------------- ChangeLog entries follow: --------------------

src/ChangeLog addition:

2010-02-09  Ben Wing  <ben@xemacs.org>

	* lisp.h:
	Disabled inline assert should just use disabled_assert()
	not disabled_assert_at_line() otherwise you get compile errors.
	(Hasn't bitten us only because no one is currently using inline
	asserts -- but this is different in the Unicode-internal repo.)

diff -r eadd99984bfb -r 4e784bfabae7 src/ChangeLog
--- a/src/ChangeLog	Tue Feb 09 03:53:52 2010 -0600
+++ b/src/ChangeLog	Tue Feb 09 06:49:57 2010 -0600
@@ -1,3 +1,11 @@
+2010-02-09  Ben Wing  <ben@xemacs.org>
+
+	* lisp.h:
+	Disabled inline assert should just use disabled_assert()
+	not disabled_assert_at_line() otherwise you get compile errors.
+	(Hasn't bitten us only because no one is currently using inline
+	asserts -- but this is different in the Unicode-internal repo.)
+
 2010-02-08  Ben Wing  <ben@xemacs.org>
 
 	* charset.h:
diff -r eadd99984bfb -r 4e784bfabae7 src/lisp.h
--- a/src/lisp.h	Tue Feb 09 03:53:52 2010 -0600
+++ b/src/lisp.h	Tue Feb 09 06:49:57 2010 -0600
@@ -165,8 +165,9 @@
 /* For assertions in inline header functions which will report the file and
    line of the calling function */
 #define inline_assert(assertion) assert_at_line (assertion, __file__, __line__)
-#define disabled_inline_assert(assertion) \
-  disabled_assert_at_line (assertion, __file__, __line__)
+/* The following should not use disabled_assert_at_line() because when the
+   inline assert is disabled, params __file__ and __line__ do not exist. */
+#define disabled_inline_assert(assertion) disabled_assert (assertion)
 
 #ifdef ERROR_CHECK_TEXT
 #define text_checking_assert(assertion) assert (assertion)