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.
This commit is contained in:
parent
3042ff60fe
commit
46ab0c252d
1 changed files with 2 additions and 4 deletions
|
|
@ -24,6 +24,8 @@ scm_module_variable (SCM module, SCM sym)
|
||||||
return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
|
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
|
#endif
|
||||||
|
|
||||||
#if SCM_MAJOR_VERSION >= 2
|
#if SCM_MAJOR_VERSION >= 2
|
||||||
|
|
@ -40,10 +42,6 @@ typedef struct swig_guile_clientdata {
|
||||||
SCM goops_class;
|
SCM goops_class;
|
||||||
} swig_guile_clientdata;
|
} 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) \
|
#define SWIG_scm2str(s) \
|
||||||
SWIG_Guile_scm2newstr(s, NULL)
|
SWIG_Guile_scm2newstr(s, NULL)
|
||||||
#define SWIG_str02scm(str) \
|
#define SWIG_str02scm(str) \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue