[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-149-g6db7ee7

[Ludovic Courtès]

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=6db7ee7b3ae8a7dbd6dc194921024287bed40a0a

The branch, stable-2.0 has been updated
       via  6db7ee7b3ae8a7dbd6dc194921024287bed40a0a (commit)
       via  e6a7a86d7ec9fe1dcb77686ca549766e1641a961 (commit)
       via  0c8a2c380d705a5113f01d5f8e042897969ca844 (commit)
      from  cba521fe42484b6689769a484408de56545d8678 (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 6db7ee7b3ae8a7dbd6dc194921024287bed40a0a
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 7 00:05:23 2013 +0100

    Make `SCM_LONG_BIT' usable in preprocessor conditionals.
    
    Reported by Jan Schukat <address@hidden>.
    Partly fixes <http://bugs.gnu.org/13848>.
    
    * libguile/__scm.h (SCM_LONG_BIT)[!defined LONG_BIT]: Use
      SCM_SIZEOF_LONG since `sizeof' cannot be used in #if directives as
      found in numbers.c.

commit e6a7a86d7ec9fe1dcb77686ca549766e1641a961
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 7 00:03:36 2013 +0100

    Use `scm_is_eq' in load.c.
    
    * libguile/load.c (is_file_name_separator): Use `scm_is_eq' instead of `=='.

commit 0c8a2c380d705a5113f01d5f8e042897969ca844
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 4 21:24:52 2013 +0100

    doc: Allow compilation of r5rs.texi with Texinfo 5.0.
    
    * doc/r5rs/r5rs.texi: Remove extraneous @author.  Change @unnumbered to
      @majorheading within @titlepage.

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

Summary of changes:
 doc/r5rs/r5rs.texi |    3 +--
 libguile/__scm.h   |    2 +-
 libguile/load.c    |    4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/r5rs/r5rs.texi b/doc/r5rs/r5rs.texi
index b7722c1..775c930 100644
--- a/doc/r5rs/r5rs.texi
+++ b/doc/r5rs/r5rs.texi
@@ -106,7 +106,6 @@
 @author C. address@hidden 
 @author K. M. address@hidden 
 @author M. address@hidden 
address@hidden 
 
 
 @c  {\it Dedicated to the Memory of ALGOL 60}
@@ -116,7 +115,7 @@
 
 
 
address@hidden Summary
address@hidden Summary
 
 
 The report gives a defining description of the programming language
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 47ed12b..ed35d53 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -433,7 +433,7 @@
 #ifdef LONG_BIT
 # define SCM_LONG_BIT LONG_BIT
 #else
-# define SCM_LONG_BIT (SCM_CHAR_BIT * sizeof (long) / sizeof (char))
+# define SCM_LONG_BIT (SCM_SIZEOF_LONG * 8)
 #endif
 
 #define SCM_I_UTYPE_MAX(type)      ((type)-1)
diff --git a/libguile/load.c b/libguile/load.c
index f2af6c8..8d50b21 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -456,10 +456,10 @@ scm_c_string_has_an_ext (char *str, size_t len, SCM 
extensions)
 static int
 is_file_name_separator (SCM c)
 {
-  if (c == SCM_MAKE_CHAR ('/'))
+  if (scm_is_eq (c, SCM_MAKE_CHAR ('/')))
     return 1;
 #ifdef __MINGW32__
-  if (c == SCM_MAKE_CHAR ('\\'))
+  if (scm_is_eq (c, SCM_MAKE_CHAR ('\\')))
     return 1;
 #endif
   return 0;


hooks/post-receive
-- 
GNU Guile