Module Name: src
Committed By: riastradh
Date: Thu Aug 15 22:22:35 UTC 2024
Modified Files:
src/lib/libc/include: namespace.h
src/lib/libc/locale: c16rtomb.c c32rtomb.c mbrtoc16.c mbrtoc32.c
Log Message:
libc: c32rtomb and mbrtoc32 are used internally, so weak-alias them.
PR lib/52374: <uchar.h> missing
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/c16rtomb.c \
src/lib/libc/locale/mbrtoc32.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/locale/c32rtomb.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/mbrtoc16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.203 src/lib/libc/include/namespace.h:1.204
--- src/lib/libc/include/namespace.h:1.203 Tue May 31 13:42:59 2022
+++ src/lib/libc/include/namespace.h Thu Aug 15 22:22:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.203 2022/05/31 13:42:59 riastradh Exp $ */
+/* $NetBSD: namespace.h,v 1.204 2024/08/15 22:22:34 riastradh Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -224,6 +224,7 @@
#define bm_comp _bm_comp
#define bm_exec _bm_exec
#define bm_free _bm_free
+#define c32rtomb _c32rtomb
#define callrpc _callrpc
#define cdbr_close _cdbr_close
#define cdbr_find _cdbr_find
@@ -511,6 +512,7 @@
#define lockf _lockf
#define lrand48 _lrand48
#define lseek _lseek
+#define mbrtoc32 _mbrtoc32
#define membar_producer _membar_producer
#define mergesort _mergesort
#define mi_vector_hash _mi_vector_hash
Index: src/lib/libc/locale/c16rtomb.c
diff -u src/lib/libc/locale/c16rtomb.c:1.2 src/lib/libc/locale/c16rtomb.c:1.3
--- src/lib/libc/locale/c16rtomb.c:1.2 Thu Aug 15 15:46:40 2024
+++ src/lib/libc/locale/c16rtomb.c Thu Aug 15 22:22:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: c16rtomb.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $ */
+/* $NetBSD: c16rtomb.c,v 1.3 2024/08/15 22:22:35 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -66,7 +66,9 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: c16rtomb.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $");
+__RCSID("$NetBSD: c16rtomb.c,v 1.3 2024/08/15 22:22:35 riastradh Exp $");
+
+#include "namespace.h"
#include <assert.h>
#include <errno.h>
Index: src/lib/libc/locale/mbrtoc32.c
diff -u src/lib/libc/locale/mbrtoc32.c:1.2 src/lib/libc/locale/mbrtoc32.c:1.3
--- src/lib/libc/locale/mbrtoc32.c:1.2 Thu Aug 15 15:46:40 2024
+++ src/lib/libc/locale/mbrtoc32.c Thu Aug 15 22:22:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrtoc32.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $ */
+/* $NetBSD: mbrtoc32.c,v 1.3 2024/08/15 22:22:35 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -52,7 +52,9 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mbrtoc32.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $");
+__RCSID("$NetBSD: mbrtoc32.c,v 1.3 2024/08/15 22:22:35 riastradh Exp $");
+
+#include "namespace.h"
#include <sys/param.h> /* MIN */
#include <sys/types.h> /* broken citrus_*.h */
@@ -80,6 +82,10 @@ __RCSID("$NetBSD: mbrtoc32.c,v 1.2 2024/
__CTASSERT(sizeof(struct mbrtoc32state) <= sizeof(mbstate_t));
__CTASSERT(alignof(struct mbrtoc32state) <= alignof(mbstate_t));
+#ifdef __weak_alias
+__weak_alias(mbrtoc32,_mbrtoc32)
+#endif
+
size_t
mbrtoc32(char32_t *restrict pc32, const char *restrict s, size_t n,
mbstate_t *restrict ps)
Index: src/lib/libc/locale/c32rtomb.c
diff -u src/lib/libc/locale/c32rtomb.c:1.1 src/lib/libc/locale/c32rtomb.c:1.2
--- src/lib/libc/locale/c32rtomb.c:1.1 Thu Aug 15 14:16:33 2024
+++ src/lib/libc/locale/c32rtomb.c Thu Aug 15 22:22:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: c32rtomb.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $ */
+/* $NetBSD: c32rtomb.c,v 1.2 2024/08/15 22:22:35 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -49,7 +49,9 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: c32rtomb.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $");
+__RCSID("$NetBSD: c32rtomb.c,v 1.2 2024/08/15 22:22:35 riastradh Exp $");
+
+#include "namespace.h"
#include <sys/types.h> /* broken citrus_*.h */
#include <sys/queue.h> /* broken citrus_*.h */
@@ -69,6 +71,10 @@ __RCSID("$NetBSD: c32rtomb.c,v 1.1 2024/
#include "citrus_hash.h" /* broken citrus_iconv.h */
#include "citrus_iconv.h"
+#ifdef __weak_alias
+__weak_alias(c32rtomb,_c32rtomb)
+#endif
+
size_t
c32rtomb(char *restrict s, char32_t c32, mbstate_t *restrict ps)
{
Index: src/lib/libc/locale/mbrtoc16.c
diff -u src/lib/libc/locale/mbrtoc16.c:1.3 src/lib/libc/locale/mbrtoc16.c:1.4
--- src/lib/libc/locale/mbrtoc16.c:1.3 Thu Aug 15 20:23:26 2024
+++ src/lib/libc/locale/mbrtoc16.c Thu Aug 15 22:22:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrtoc16.c,v 1.3 2024/08/15 20:23:26 riastradh Exp $ */
+/* $NetBSD: mbrtoc16.c,v 1.4 2024/08/15 22:22:35 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -73,7 +73,9 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mbrtoc16.c,v 1.3 2024/08/15 20:23:26 riastradh Exp $");
+__RCSID("$NetBSD: mbrtoc16.c,v 1.4 2024/08/15 22:22:35 riastradh Exp $");
+
+#include "namespace.h"
#include <assert.h>
#include <errno.h>
