d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WITHOUT_ICONV build after r340276.

Browse Source 
Reported by:	olivier
Approved by:	kib (mentor, implicit)
This commit is contained in:
Yuri Pankov 2018-11-14 09:06:15 +00:00
parent 1894626876
commit 98f3acfaaf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340429
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/locale/c16rtomb.c
View File

@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <uchar.h>
#include "xlocale_private.h"
#include "mblocal.h"
typedef struct {
char16_t lead_surrogate;
@ -47,7 +47,7 @@ c16rtomb_l(char * __restrict s, char16_t c16, mbstate_t * __restrict ps,
FIX_LOCALE(locale);
if (ps == NULL)
ps = &locale->c16rtomb;
ps = &(XLOCALE_CTYPE(locale)->c16rtomb);
cs = (_Char16State *)ps;
/* If s is a null pointer, the value of parameter c16 is ignored. */

4
lib/libc/locale/c32rtomb.c
View File

@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <uchar.h>
#include <wchar.h>
#include "xlocale_private.h"
#include "mblocal.h"
size_t
c32rtomb_l(char * __restrict s, char32_t c32, mbstate_t * __restrict ps,
@ -47,7 +47,7 @@ c32rtomb_l(char * __restrict s, char32_t c32, mbstate_t * __restrict ps,
FIX_LOCALE(locale);
if (ps == NULL)
ps = &locale->c32rtomb;
ps = &(XLOCALE_CTYPE(locale)->c32rtomb);
/* Assume wchar_t uses UTF-32. */
return (wcrtomb_l(s, c32, ps, locale));

4
lib/libc/locale/mbrtoc16.c
View File

@ -30,7 +30,7 @@
__FBSDID("$FreeBSD$");
#include <uchar.h>
#include "xlocale_private.h"
#include "mblocal.h"
typedef struct {
char16_t trail_surrogate;
@ -47,7 +47,7 @@ mbrtoc16_l(char16_t * __restrict pc16, const char * __restrict s, size_t n,
FIX_LOCALE(locale);
if (ps == NULL)
ps = &locale->mbrtoc16;
ps = &(XLOCALE_CTYPE(locale)->mbrtoc16);
cs = (_Char16State *)ps;
/*

4
lib/libc/locale/mbrtoc32.c
View File

@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <uchar.h>
#include <wchar.h>
#include "xlocale_private.h"
#include "mblocal.h"
size_t
mbrtoc32_l(char32_t * __restrict pc32, const char * __restrict s, size_t n,
@ -40,7 +40,7 @@ mbrtoc32_l(char32_t * __restrict pc32, const char * __restrict s, size_t n,
FIX_LOCALE(locale);
if (ps == NULL)
ps = &locale->mbrtoc32;
ps = &(XLOCALE_CTYPE(locale)->mbrtoc32);
/* Assume wchar_t uses UTF-32. */
return (mbrtowc_l(pc32, s, n, ps, locale));