(SCM_ASRTGO): add "else" to macro expansions with if

clauses.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index bbf8250..6d90004 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * __scm.h (SCM_ASRTGO): add "else" to macro expansions with if
+       clauses.
+       
 2003-06-29  Marius Vollmer  <mvo@zagadka.de>
 
        * deprecated.h (SCM_OPDIRP, scm_fport, scm_option, scm_srcprops,

diff --git a/libguile/__scm.h b/libguile/__scm.h
index 9411349..770d888 100644 (file)
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -492,13 +492,13 @@ do { \
 #else
 #define SCM_ASSERT(_cond, _arg, _pos, _subr) \
        if (!(_cond)) \
-          scm_wrong_type_arg (_subr, _pos, _arg)
+          scm_wrong_type_arg (_subr, _pos, _arg); else
 #define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg) \
        if (!(_cond)) \
-          scm_wrong_type_arg_msg(_subr, _pos, _arg, _msg)
+          scm_wrong_type_arg_msg(_subr, _pos, _arg, _msg); else
 #define SCM_ASRTGO(_cond, _label) \
         if (!(_cond)) \
-          goto _label
+          goto _label; else
 #endif
 
 /*