[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-116-g9a38439

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=9a38439301aac35961e8f7e316cd02a589b5956f

The branch, stable-2.0 has been updated
       via  9a38439301aac35961e8f7e316cd02a589b5956f (commit)
      from  866ecf54c04c2b841f40f3a02814eeba6aeb4dee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a38439301aac35961e8f7e316cd02a589b5956f
Author: Andy Wingo <address@hidden>
Date:   Sun Jan 8 16:01:28 2012 +0100

    fix SCM_ASRTGO deprecation
    
    * libguile/__scm.h (SCM_ASRTGO): Whoops, actually remove the ASRTGO
      definitions here.
    * libguile/deprecated.h: Fix type of scm_i_deprecated_asrtgo.

-----------------------------------------------------------------------

Summary of changes:
 libguile/__scm.h      |    6 +-----
 libguile/deprecated.h |    2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libguile/__scm.h b/libguile/__scm.h
index f5551ad..c4f2a1a 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -4,7 +4,7 @@
 #define SCM___SCM_H
 
 /* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
- *   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ *   2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -593,7 +593,6 @@ do { \
 #ifdef SCM_RECKLESS
 #define SCM_ASSERT(_cond, _arg, _pos, _subr)
 #define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg)
-#define SCM_ASRTGO(_cond, _label)
 #else
 #define SCM_ASSERT(_cond, _arg, _pos, _subr)                   \
         do { if (SCM_UNLIKELY (!(_cond)))                      \
@@ -601,9 +600,6 @@ do { \
 #define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg)                        
\
         do { if (SCM_UNLIKELY (!(_cond)))                              \
           scm_wrong_type_arg_msg(_subr, _pos, _arg, _msg);  } while (0)
-#define SCM_ASRTGO(_cond, _label)              \
-        do {  if (SCM_UNLIKELY (!(_cond)))     \
-          goto _label; } while (0)
 #endif
 
 /*
diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index ed81344..2b85bef 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -802,7 +802,7 @@ SCM_DEPRECATED SCM scm_immutable_double_cell (scm_t_bits 
car, scm_t_bits cbr,
 
 
 
-SCM_DEPRECATED SCM scm_i_deprecated_asrtgo (scm_t_bits condition);
+SCM_DEPRECATED scm_t_bits scm_i_deprecated_asrtgo (scm_t_bits condition);
 
 /* Deprecated 08-01-2012, as it's undocumented and unused.  */
 #define SCM_ASRTGO(_cond, _label)              \


hooks/post-receive
-- 
GNU Guile