[Guile-commits] GNU Guile branch, master, updated. release_1-9-14-182-g527ba9b

[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=527ba9b72662a1872ab7c96a8d9e1b02ffa3c6bd

The branch, master has been updated
       via  527ba9b72662a1872ab7c96a8d9e1b02ffa3c6bd (commit)
       via  215e03127d5c8f7375cf4d8dd0ef57797738de47 (commit)
      from  fc740bfce727f5f7f026e0de7ad21306fead9490 (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 527ba9b72662a1872ab7c96a8d9e1b02ffa3c6bd
Author: Ludovic Courtès <address@hidden>
Date:   Wed Feb 2 22:03:18 2011 +0100

    Fix `GUILE_THREAD_LOCAL_STORAGE'.
    
    * acinclude.m4 (GUILE_THREAD_LOCAL_STORAGE): Fix M4 quotation.

commit 215e03127d5c8f7375cf4d8dd0ef57797738de47
Author: Ludovic Courtès <address@hidden>
Date:   Wed Feb 2 22:02:09 2011 +0100

    Enclose SRFI-13 deprecation handling in `#if SCM_ENABLE_DEPRECATED == 1'.
    
    * libguile/srfi-13.c (scm_string_filter, scm_string_delete): Enclose
      deprecated call convention handling in `#if SCM_ENABLE_DEPRECATED == 1'.

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

Summary of changes:
 acinclude.m4       |   16 ++++++++--------
 libguile/srfi-13.c |    8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 55b05ed..3dbea2a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -379,16 +379,16 @@ AC_DEFUN([GUILE_THREAD_LOCAL_STORAGE], [
      dnl On `x86_64-unknown-freebsd8.0', thread-local storage appears to
      dnl be reclaimed at the wrong time, leading to a segfault when
      dnl running `threads.test'.  So disable it.
-     case "x$enable_shared--$host_os" in
-       xyes--netbsd[0-5].[0-9].|xyes--solaris2.8|xyes--freebsd[0-8]*)
+     case "$enable_shared--$host_os" in
+       [yes--netbsd[0-5].[0-9].|yes--solaris2.8|yes--freebsd[0-8]*])
          ac_cv_have_thread_storage_class="no"
-        ;;
+         ;;
        *)
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([__thread int tls_integer;],
-                         [tls_integer = 123;])],
-          [ac_cv_have_thread_storage_class="yes"],
-          [ac_cv_have_thread_storage_class="no"])
-        ;;
+         AC_LINK_IFELSE([AC_LANG_PROGRAM([__thread int tls_integer;],
+                          [tls_integer = 123;])],
+           [ac_cv_have_thread_storage_class="yes"],
+           [ac_cv_have_thread_storage_class="no"])
+         ;;
      esac])
 
   if test "x$ac_cv_have_thread_storage_class" = "xyes"; then
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index dfe948b..9efe275 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -3051,10 +3051,11 @@ SCM_DEFINE (scm_string_filter, "string-filter", 2, 2, 0,
   SCM result;
   size_t idx;
 
+#if SCM_ENABLE_DEPRECATED == 1
   if (scm_is_string (char_pred))
     {
       SCM tmp;
-      
+
       scm_c_issue_deprecation_warning
         ("Guile used to use the wrong argument order for string-filter.\n"
          "This call to string-filter had the arguments in the wrong order.\n"
@@ -3064,6 +3065,7 @@ SCM_DEFINE (scm_string_filter, "string-filter", 2, 2, 0,
       char_pred = s;
       s = tmp;
     }
+#endif
 
   MY_VALIDATE_SUBSTRING_SPEC (2, s,
                              3, start, cstart,
@@ -3182,10 +3184,11 @@ SCM_DEFINE (scm_string_delete, "string-delete", 2, 2, 0,
   SCM result;
   size_t idx;
 
+#if SCM_ENABLE_DEPRECATED == 1
   if (scm_is_string (char_pred))
     {
       SCM tmp;
-      
+
       scm_c_issue_deprecation_warning
         ("Guile used to use the wrong argument order for string-delete.\n"
          "This call to string-filter had the arguments in the wrong order.\n"
@@ -3195,6 +3198,7 @@ SCM_DEFINE (scm_string_delete, "string-delete", 2, 2, 0,
       char_pred = s;
       s = tmp;
     }
+#endif
 
   MY_VALIDATE_SUBSTRING_SPEC (2, s,
                              3, start, cstart,


hooks/post-receive
-- 
GNU Guile