From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 23 Aug 2025 03:18:13 +0000 (-0700)
Subject: mbfile: Make mb_setascii an inline function.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f983eb6c1d88bf1fcbf88a1020af589f4ec2d4;p=thirdparty%2Fgnulib.git

mbfile: Make mb_setascii an inline function.

* lib/mbchar.h (mb_setascii): Define as an extern inline function
instead of a macro.
---

diff --git a/ChangeLog b/ChangeLog
index 62a792c994..5f31013c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-08-22  Collin Funk  <collin.funk1@gmail.com>
+
+	mbfile: Make mb_setascii an inline function.
+	* lib/mbchar.h (mb_setascii): Define as an extern inline function
+	instead of a macro.
+
 2024-08-19  Bruno Haible  <bruno@clisp.org>
 
 	doc: Update for glibc 2.42.
diff --git a/lib/mbchar.h b/lib/mbchar.h
index d77168e717..85422cd527 100644
--- a/lib/mbchar.h
+++ b/lib/mbchar.h
@@ -262,9 +262,14 @@ mb_width_aux (char32_t wc)
 
 #if defined GNULIB_MBFILE
 /* Assignment.  */
-# define mb_setascii(mbc, sc) \
-   ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \
-    (mbc)->wc = (mbc)->buf[0] = (sc))
+MBCHAR_INLINE void
+mb_setascii (mbchar_t *mbc, char sc)
+{
+  mbc->ptr = mbc->buf;
+  mbc->bytes = 1;
+  mbc->wc_valid = true;
+  mbc->wc = mbc->buf[0] = sc;
+}
 #endif
 
 /* Copying a character.  */