[Guile-commits] GNU Guile branch, master, updated. release_1-9-7-69-g44d3d11

[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=44d3d1114447ee619bc9a900afb410273b56aae2

The branch, master has been updated
       via  44d3d1114447ee619bc9a900afb410273b56aae2 (commit)
      from  3ea159afc5c476e06148cf5fc2a1fb77267326f6 (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 44d3d1114447ee619bc9a900afb410273b56aae2
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 15 19:40:42 2010 +0100

    Fix builds of `i18n.c' on non-GNU systems.
    
    * libguile/i18n.c (chr_to_case, str_to_case): Add `func_name' argument
      and `FUNC_NAME' macro.  Update callers.

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

Summary of changes:
 libguile/i18n.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libguile/i18n.c b/libguile/i18n.c
index b689caf..b381b05 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2007, 2008, 2009, 2010 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
@@ -1102,7 +1102,9 @@ static SCM
 chr_to_case (SCM chr, scm_t_locale c_locale, 
             scm_t_uint32 *(*func) (const scm_t_uint32 *, size_t, const char *,
                                    uninorm_t, scm_t_uint32 *, size_t *),
+            const char *func_name,
             int *err)
+#define FUNC_NAME func_name
 {
   int ret;
   scm_t_wchar *buf;
@@ -1137,6 +1139,7 @@ chr_to_case (SCM chr, scm_t_locale c_locale,
 
   return convchar;
 }
+#undef FUNC_NAME
 
 SCM_DEFINE (scm_char_locale_downcase, "char-locale-downcase", 1, 1, 0,
            (SCM chr, SCM locale),
@@ -1151,7 +1154,7 @@ SCM_DEFINE (scm_char_locale_downcase, 
"char-locale-downcase", 1, 1, 0,
   SCM_VALIDATE_CHAR (1, chr);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = chr_to_case (chr, c_locale, u32_tolower, &err);
+  ret = chr_to_case (chr, c_locale, u32_tolower, FUNC_NAME, &err);
 
   if (err != 0)
     {
@@ -1175,7 +1178,7 @@ SCM_DEFINE (scm_char_locale_upcase, "char-locale-upcase", 
1, 1, 0,
   SCM_VALIDATE_CHAR (1, chr);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = chr_to_case (chr, c_locale, u32_toupper, &err);
+  ret = chr_to_case (chr, c_locale, u32_toupper, FUNC_NAME, &err);
 
   if (err != 0)
     {
@@ -1199,7 +1202,7 @@ SCM_DEFINE (scm_char_locale_titlecase, 
"char-locale-titlecase", 1, 1, 0,
   SCM_VALIDATE_CHAR (1, chr);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = chr_to_case (chr, c_locale, u32_totitle, &err);
+  ret = chr_to_case (chr, c_locale, u32_totitle, FUNC_NAME, &err);
 
   if (err != 0)
     {
@@ -1214,7 +1217,9 @@ static SCM
 str_to_case (SCM str, scm_t_locale c_locale,
             scm_t_uint32 *(*func) (const scm_t_uint32 *, size_t, const char *,
                                    uninorm_t, scm_t_uint32 *, size_t *),
+            const char *func_name,
             int *err)
+#define FUNC_NAME func_name
 {
   scm_t_wchar *c_str, *c_buf;
   scm_t_uint32 *c_convstr;
@@ -1253,6 +1258,7 @@ str_to_case (SCM str, scm_t_locale c_locale,
 
   return convstr;
 }
+#undef FUNC_NAME
 
 SCM_DEFINE (scm_string_locale_upcase, "string-locale-upcase", 1, 1, 0,
            (SCM str, SCM locale),
@@ -1268,7 +1274,7 @@ SCM_DEFINE (scm_string_locale_upcase, 
"string-locale-upcase", 1, 1, 0,
   SCM_VALIDATE_STRING (1, str);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = str_to_case (str, c_locale, u32_toupper, &err);
+  ret = str_to_case (str, c_locale, u32_toupper, FUNC_NAME, &err);
   
   if (err != 0)
     {
@@ -1293,7 +1299,7 @@ SCM_DEFINE (scm_string_locale_downcase, 
"string-locale-downcase", 1, 1, 0,
   SCM_VALIDATE_STRING (1, str);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = str_to_case (str, c_locale, u32_tolower, &err);
+  ret = str_to_case (str, c_locale, u32_tolower, FUNC_NAME, &err);
 
   if (err != 0)
     {
@@ -1318,7 +1324,7 @@ SCM_DEFINE (scm_string_locale_titlecase, 
"string-locale-titlecase", 1, 1, 0,
   SCM_VALIDATE_STRING (1, str);
   SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
 
-  ret = str_to_case (str, c_locale, u32_totitle, &err);
+  ret = str_to_case (str, c_locale, u32_totitle, FUNC_NAME, &err);
 
   if (err != 0)
     {


hooks/post-receive
-- 
GNU Guile