[Guile-commits] GNU Guile branch, master, updated. release_1-9-13-218-g6bf623c

[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=6bf623ca34d35b3c969520924bb32d97427d559a

The branch, master has been updated
       via  6bf623ca34d35b3c969520924bb32d97427d559a (commit)
      from  133ef660af79f3f653df2d029f1cadc20a1c42c9 (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 6bf623ca34d35b3c969520924bb32d97427d559a
Author: Ludovic Courtès <address@hidden>
Date:   Fri Dec 17 14:34:22 2010 +0100

    Remove conflicting `scm_is_string' declaration.
    
    * libguile/strings.h: Move `scm_is_string' declaration...
    * libguile/inline.h: ... here.
      Reported by Noah Lavine <address@hidden>.

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

Summary of changes:
 libguile/inline.h  |    1 +
 libguile/strings.h |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libguile/inline.h b/libguile/inline.h
index 9cc23ba..1eae2e4 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -95,6 +95,7 @@ SCM_API SCM scm_array_handle_ref (scm_t_array_handle *h, 
ssize_t pos);
 SCM_API void scm_array_handle_set (scm_t_array_handle *h, ssize_t pos, SCM 
val);
 
 SCM_API int scm_is_pair (SCM x);
+SCM_API int scm_is_string (SCM x);
 
 SCM_API int scm_get_byte_or_eof (SCM port);
 SCM_API void scm_putc (char c, SCM port);
diff --git a/libguile/strings.h b/libguile/strings.h
index d439259..00bc224 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -125,7 +125,6 @@ SCM_API SCM scm_c_substring_read_only (SCM str, size_t 
start, size_t end);
 SCM_API SCM scm_c_substring_shared (SCM str, size_t start, size_t end);
 SCM_API SCM scm_c_substring_copy (SCM str, size_t start, size_t end);
 
-SCM_API int scm_is_string (SCM x);
 SCM_API SCM scm_from_latin1_stringn (const char *str, size_t len);
 SCM_API SCM scm_from_locale_string (const char *str);
 SCM_API SCM scm_from_locale_stringn (const char *str, size_t len);


hooks/post-receive
-- 
GNU Guile