Mercurial > hg > xemacs-beta
changeset 4975:c5cb3cb79110
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 04:27:45 -0600 |
| parents | fe0d3106cc36 (diff) 3bf1b0f0c391 (current diff) |
| children | f48bf636045f |
| files | src/ChangeLog |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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 */