svn commit: r340429 - head/lib/libc/locale

[Yuri Pankov]

Author: yuripv
Date: Wed Nov 14 09:06:15 2018
New Revision: 340429
URL: https://svnweb.freebsd.org/changeset/base/340429

Log:
  Fix WITHOUT_ICONV build after r340276.
  
  Reported by:	olivier
  Approved by:	kib (mentor, implicit)

Modified:
  head/lib/libc/locale/c16rtomb.c
  head/lib/libc/locale/c32rtomb.c
  head/lib/libc/locale/mbrtoc16.c
  head/lib/libc/locale/mbrtoc32.c

Modified: head/lib/libc/locale/c16rtomb.c
==============================================================================
--- head/lib/libc/locale/c16rtomb.c	Wed Nov 14 08:45:48 2018	(r340428)
+++ head/lib/libc/locale/c16rtomb.c	Wed Nov 14 09:06:15 2018	(r340429)
@@ -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_
 
 	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. */

Modified: head/lib/libc/locale/c32rtomb.c
==============================================================================
--- head/lib/libc/locale/c32rtomb.c	Wed Nov 14 08:45:48 2018	(r340428)
+++ head/lib/libc/locale/c32rtomb.c	Wed Nov 14 09:06:15 2018	(r340429)
@@ -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_
 
 	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));

Modified: head/lib/libc/locale/mbrtoc16.c
==============================================================================
--- head/lib/libc/locale/mbrtoc16.c	Wed Nov 14 08:45:48 2018	(r340428)
+++ head/lib/libc/locale/mbrtoc16.c	Wed Nov 14 09:06:15 2018	(r340429)
@@ -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 * __
 
 	FIX_LOCALE(locale);
 	if (ps == NULL)
-		ps = &locale->mbrtoc16;
+		ps = &(XLOCALE_CTYPE(locale)->mbrtoc16);
 	cs = (_Char16State *)ps;
 
 	/*

Modified: head/lib/libc/locale/mbrtoc32.c
==============================================================================
--- head/lib/libc/locale/mbrtoc32.c	Wed Nov 14 08:45:48 2018	(r340428)
+++ head/lib/libc/locale/mbrtoc32.c	Wed Nov 14 09:06:15 2018	(r340429)
@@ -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 * __
 
 	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));