diff options
author | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
commit | 21c05db45b69f8a62b84c36abc86cb935fa967d7 (patch) | |
tree | 743df01da540e7fd628f54894e7d5fbe94b03996 /libguile/foreign.h | |
parent | 4db853d747ac115f799c93e2de93f5159ad84109 (diff) | |
parent | c89b45299329d034875429804f18768c1ea96713 (diff) | |
download | guile-21c05db45b69f8a62b84c36abc86cb935fa967d7.tar.gz |
Merge remote branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
test-suite/tests/srfi-4.test
Diffstat (limited to 'libguile/foreign.h')
-rw-r--r-- | libguile/foreign.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/foreign.h b/libguile/foreign.h index b29001962..6c6f37306 100644 --- a/libguile/foreign.h +++ b/libguile/foreign.h @@ -72,8 +72,8 @@ SCM_INTERNAL void scm_i_pointer_print (SCM pointer, SCM port, scm_print_state *pstate); SCM_INTERNAL SCM scm_dereference_pointer (SCM pointer); -SCM_INTERNAL SCM scm_string_to_pointer (SCM string); -SCM_INTERNAL SCM scm_pointer_to_string (SCM pointer); +SCM_INTERNAL SCM scm_string_to_pointer (SCM string, SCM encoding); +SCM_INTERNAL SCM scm_pointer_to_string (SCM pointer, SCM length, SCM encoding); |