summaryrefslogtreecommitdiff
path: root/Lib/guile/guile_scm_run.swg
diff options
context:
space:
mode:
authorGeert Janssens <geert@kobaltwit.be>2018-04-16 19:52:29 +0200
committerOlly Betts <ojwbetts@gmail.com>2018-04-18 13:07:03 +1200
commit46ab0c252da9ab846265a60517ca462e5256cd24 (patch)
tree7a6955f5d7d56781191d6f12437fed1da4b7f93b /Lib/guile/guile_scm_run.swg
parent3042ff60fe42553df1fe51343d1bcd5aa96c825d (diff)
downloadswig-46ab0c252da9ab846265a60517ca462e5256cd24.tar.gz
Fix off-by-one error
The condition only applies to guile 1.8 and older so it should really have been '<2' all along. As we already have such a conditional block earlier up, merge the two together as well.
Diffstat (limited to 'Lib/guile/guile_scm_run.swg')
-rw-r--r--Lib/guile/guile_scm_run.swg6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
index 1cc08b024..274f19715 100644
--- a/Lib/guile/guile_scm_run.swg
+++ b/Lib/guile/guile_scm_run.swg
@@ -24,6 +24,8 @@ scm_module_variable (SCM module, SCM sym)
return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
}
+#define scm_to_utf8_string scm_to_locale_string
+#define scm_from_utf8_string scm_from_locale_string
#endif
#if SCM_MAJOR_VERSION >= 2
@@ -40,10 +42,6 @@ typedef struct swig_guile_clientdata {
SCM goops_class;
} swig_guile_clientdata;
-#if SCM_MAJOR_VERSION <= 2
-#define scm_to_utf8_string scm_to_locale_string
-#define scm_from_utf8_string scm_from_locale_string
-#endif
#define SWIG_scm2str(s) \
SWIG_Guile_scm2newstr(s, NULL)
#define SWIG_str02scm(str) \