# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265365665 21600
# Node ID c5cb3cb7911064305537c8967797245227041a4b
# Parent  fe0d3106cc36a996b54dd51462a80e9a4080e29d# Parent  3bf1b0f0c39163f7ab6a22165d91528b8d7900de
Automatic merge

diff -r 3bf1b0f0c391 -r c5cb3cb79110 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 04 18:27:39 2010 -0600
+++ b/src/ChangeLog	Fri Feb 05 04:27:45 2010 -0600
@@ -1,3 +1,10 @@
+2010-02-05  Ben Wing  <ben@xemacs.org>
+
+	* bytecode.c (bytecode_assert):
+	Use 0 instead of x in disabled_assert calls to avoid errors due
+	to using undefined vars/params (they are defined only when
+	ERROR_CHECK_BYTE_CODE, which also turns on/off the asserts).
+
 2010-02-04  Ben Wing  <ben@xemacs.org>
 
 	* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
diff -r 3bf1b0f0c391 -r c5cb3cb79110 src/bytecode.c
--- a/src/bytecode.c	Thu Feb 04 18:27:39 2010 -0600
+++ b/src/bytecode.c	Fri Feb 05 04:27:45 2010 -0600
@@ -121,8 +121,14 @@
 
 #ifndef ERROR_CHECK_BYTE_CODE
 
-# define bytecode_assert(x) disabled_assert (x)
-# define bytecode_assert_with_message(x, msg) disabled_assert(x)
+/* Normally we would use `x' instead of `0' in the argument list, to avoid
+   problems if `x' (an expression) has side effects, and warnings if `x'
+   contains variables or parameters that are otherwise unused.  But in
+   this case `x' contains references to vars and params that exist only
+   when ERROR_CHECK_BYTE_CODE, and leaving in `x' would result in compile
+   errors. */
+# define bytecode_assert(x) disabled_assert (0)
+# define bytecode_assert_with_message(x, msg) disabled_assert(0)
 # define bytecode_abort_with_message(msg) abort_with_message (msg)
 
 #else /* ERROR_CHECK_BYTE_CODE */