diff options
Diffstat (limited to 'wcsmbs/wcsmbsload.c')
| -rw-r--r-- | wcsmbs/wcsmbsload.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index af539a099a..2650834e29 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -155,7 +155,7 @@ __wcsmbs_load_conv (struct __locale_data *new_category) /* We should repeat the test since while we waited some other thread might have run this function. */ - if (__glibc_likely (new_category->private.ctype == NULL)) + if (__glibc_likely (new_category->private == NULL)) { /* We must find the real functions. */ const char *charset_name; @@ -199,10 +199,10 @@ __wcsmbs_load_conv (struct __locale_data *new_category) free (new_fcts); failed: - new_category->private.ctype = &__wcsmbs_gconv_fcts_c; + new_category->private = (void *) &__wcsmbs_gconv_fcts_c; } else - new_category->private.ctype = new_fcts; + new_category->private = new_fcts; } __libc_rwlock_unlock (__libc_setlocale_lock); @@ -263,10 +263,10 @@ __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name) void _nl_cleanup_ctype (struct __locale_data *locale) { - const struct gconv_fcts *const data = locale->private.ctype; + const struct gconv_fcts *const data = locale->private; if (data != NULL && data != &__wcsmbs_gconv_fcts_c) { - locale->private.ctype = NULL; + locale->private = NULL; /* Free the old conversions. */ __gconv_close_transform (data->tomb, data->tomb_nsteps); |