mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 11:40:18 +02:00
Changes from arch/CVS synchronization
This commit is contained in:
parent
29776e85da
commit
1445e4492f
2 changed files with 15 additions and 3 deletions
|
@ -1,3 +1,13 @@
|
||||||
|
2007-10-04 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
||||||
|
* i18n.c (scm_make_locale)[!USE_GNU_LOCALE_API]: Don't call
|
||||||
|
`leave_locale_section ()' on failure of
|
||||||
|
`enter_locale_section ()' since the mutex is not held and locale
|
||||||
|
settings are unchanged.
|
||||||
|
(scm_nl_langinfo)[!USE_GNU_LOCALE_API]: Use
|
||||||
|
`restore_locale_settings ()' instead of `leave_locale_section ()'
|
||||||
|
since the mutex is not held.
|
||||||
|
|
||||||
2007-10-02 Ludovic Courtès <ludo@gnu.org>
|
2007-10-02 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
||||||
* threads.c (on_thread_exit): Don't call `scm_leave_guile ()'
|
* threads.c (on_thread_exit): Don't call `scm_leave_guile ()'
|
||||||
|
|
|
@ -685,12 +685,14 @@ SCM_DEFINE (scm_make_locale, "make-locale", 2, 1, 0,
|
||||||
scm_t_locale_settings prev_locale;
|
scm_t_locale_settings prev_locale;
|
||||||
|
|
||||||
err = enter_locale_section (c_locale, &prev_locale);
|
err = enter_locale_section (c_locale, &prev_locale);
|
||||||
leave_locale_section (&prev_locale);
|
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
goto fail;
|
goto fail;
|
||||||
else
|
else
|
||||||
SCM_NEWSMOB (locale, scm_tc16_locale_smob_type, c_locale);
|
{
|
||||||
|
leave_locale_section (&prev_locale);
|
||||||
|
SCM_NEWSMOB (locale, scm_tc16_locale_smob_type, c_locale);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1410,7 +1412,7 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
|
||||||
{
|
{
|
||||||
c_result = nl_langinfo (c_item);
|
c_result = nl_langinfo (c_item);
|
||||||
|
|
||||||
leave_locale_section (&lsec_prev_locale);
|
restore_locale_settings (&lsec_prev_locale);
|
||||||
free_locale_settings (&lsec_prev_locale);
|
free_locale_settings (&lsec_prev_locale);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue