summaryrefslogtreecommitdiff
path: root/libguile/strings.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-05-22 20:15:09 +0200
committerAndy Wingo <wingo@pobox.com>2016-05-22 20:21:49 +0200
commit2badbd06f695127039e8772f56e9ba44ec875896 (patch)
treeaf8b65cfe476fa4f783b491a6fd920a4e0a90782 /libguile/strings.h
parentfd17cf9f72bcfc1832775c848e678e695d05dbd8 (diff)
parenta7d0a0de2fa5fd99f001b1c6d42c0ae497a2cb1f (diff)
downloadguile-2badbd06f695127039e8772f56e9ba44ec875896.tar.gz
Merge from stable-2.0
This cherry-picks changes from stable-2.0, starting from acd2c8e36a25d77e9e9c9b6782780b23a1764973 and ending in 461b62efc90135d3ca8719ba0f3b6ced4ad13754, inclusively. I did not cherry-pick patches that were already on master and did not cherry-pick ones that don't make sense on master (for example because of the port re-write). I did pick all tests though. I also did not cherry-pick the "Revert foreign objects" patch from ff98cbb643d43c9f8c6ee0e0b4e1bad72aced62e; further discussion necessary.
Diffstat (limited to 'libguile/strings.h')
-rw-r--r--libguile/strings.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libguile/strings.h b/libguile/strings.h
index 24471cd69..882e7ce64 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -3,7 +3,8 @@
#ifndef SCM_STRINGS_H
#define SCM_STRINGS_H
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000, 2001, 2004-2006, 2008-2011, 2013,
+ * 2015-2016 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
@@ -107,6 +108,7 @@ SCM_API SCM scm_string_p (SCM x);
SCM_API SCM scm_string (SCM chrs);
SCM_API SCM scm_make_string (SCM k, SCM chr);
SCM_API SCM scm_string_length (SCM str);
+SCM_API SCM scm_string_utf8_length (SCM str);
SCM_API SCM scm_string_bytes_per_char (SCM str);
SCM_API SCM scm_string_ref (SCM str, SCM k);
SCM_API SCM scm_string_set_x (SCM str, SCM k, SCM chr);
@@ -120,6 +122,7 @@ SCM_API SCM scm_from_stringn (const char *str, size_t len, const char *encoding,
scm_t_string_failed_conversion_handler handler);
SCM_API SCM scm_c_make_string (size_t len, SCM chr);
SCM_API size_t scm_c_string_length (SCM str);
+SCM_API size_t scm_c_string_utf8_length (SCM str);
SCM_API size_t scm_c_symbol_length (SCM sym);
SCM_API SCM scm_c_string_ref (SCM str, size_t pos);
SCM_API void scm_c_string_set_x (SCM str, size_t pos, SCM chr);