Switch _MB_ to __MB_

Use __ namespace for config options.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

CMakeLists.txt

@@ -165,28 +165,28 @@ if(NOT DEFINED __ASSERT_VERBOSE)
   option(__ASSERT_VERBOSE "Assert provides verbose information" ON)
 endif()
 
-if(NOT DEFINED _MB_CAPABLE)
-  option(_MB_CAPABLE "Enable multi-byte support" OFF)
+if(NOT DEFINED __MB_CAPABLE)
+  option(__MB_CAPABLE "Enable multi-byte support" OFF)
 endif()
 
-if(NOT DEFINED _MB_EXTENDED_CHARSETS_ALL)
-  option(_MB_EXTENDED_CHARSETS_ALL "Enable UCS, ISO, Windows and JIS multibyte encodings" OFF)
+if(NOT DEFINED __MB_EXTENDED_CHARSETS_ALL)
+  option(__MB_EXTENDED_CHARSETS_ALL "Enable UCS, ISO, Windows and JIS multibyte encodings" OFF)
 endif()
 
-if(NOT DEFINED _MB_EXTENDED_CHARSETS_UCS)
-  option(_MB_EXTENDED_CHARSETS_UCS "Enable UCS encodings" OFF)
+if(NOT DEFINED __MB_EXTENDED_CHARSETS_UCS)
+  option(__MB_EXTENDED_CHARSETS_UCS "Enable UCS encodings" OFF)
 endif()
 
-if(NOT DEFINED _MB_EXTENDED_CHARSETS_ISO)
-  option(_MB_EXTENDED_CHARSETS_ISO "Enable ISO encodings" OFF)
+if(NOT DEFINED __MB_EXTENDED_CHARSETS_ISO)
+  option(__MB_EXTENDED_CHARSETS_ISO "Enable ISO encodings" OFF)
 endif()
 
-if(NOT DEFINED _MB_EXTENDED_CHARSETS_WINDOWS)
-  option(_MB_EXTENDED_CHARSETS_WINDOWS "Enable Windows encodings" OFF)
+if(NOT DEFINED __MB_EXTENDED_CHARSETS_WINDOWS)
+  option(__MB_EXTENDED_CHARSETS_WINDOWS "Enable Windows encodings" OFF)
 endif()
 
-if(NOT DEFINED _MB_EXTENDED_CHARSETS_JIS)
-  option(_MB_EXTENDED_CHARSETS_JIS "Enable JIS multibyte encodings" OFF)
+if(NOT DEFINED __MB_EXTENDED_CHARSETS_JIS)
+  option(__MB_EXTENDED_CHARSETS_JIS "Enable JIS multibyte encodings" OFF)
 endif()
 
 set(_NANO_FORMATTED_IO OFF)

meson.build

@@ -1376,12 +1376,12 @@ conf_data.set('__THREAD_LOCAL_STORAGE_RP2040', get_option('tls-rp2040'),
 conf_data.set('__HAVE_BITFIELDS_IN_PACKED_STRUCTS', have_bitfields_in_packed_structs, description: 'Use bitfields in packed structs')
 conf_data.set('__HAVE_COMPLEX', have_complex, description: 'Compiler supports _Complex')
 
-conf_data.set('_MB_CAPABLE', mb_capable)
+conf_data.set('__MB_CAPABLE', mb_capable)
 if mb_capable
-  conf_data.set('_MB_EXTENDED_CHARSETS_UCS', mb_ucs_charsets)
-  conf_data.set('_MB_EXTENDED_CHARSETS_ISO', mb_iso_charsets)
-  conf_data.set('_MB_EXTENDED_CHARSETS_WINDOWS', mb_windows_charsets)
-  conf_data.set('_MB_EXTENDED_CHARSETS_JIS', mb_jis_charsets)
+  conf_data.set('__MB_EXTENDED_CHARSETS_UCS', mb_ucs_charsets)
+  conf_data.set('__MB_EXTENDED_CHARSETS_ISO', mb_iso_charsets)
+  conf_data.set('__MB_EXTENDED_CHARSETS_WINDOWS', mb_windows_charsets)
+  conf_data.set('__MB_EXTENDED_CHARSETS_JIS', mb_jis_charsets)
 endif
 
 conf_data.set('_PICO_EXIT', picoexit)

newlib/libc/ctype/ctype_.c

@@ -40,7 +40,7 @@ const char _ctype_b[128 + 256] = {
 	_CTYPE_DATA_128_255
 };
 
-#ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
+#ifdef __MB_EXTENDED_CHARSETS_NON_UNICODE
 
 #include "ctype_extended.h"
 
@@ -53,7 +53,7 @@ const char _ctype_b[128 + 256] = {
         }
 
 const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256] = {
-#ifdef _MB_EXTENDED_CHARSETS_ISO
+#ifdef __MB_EXTENDED_CHARSETS_ISO
     __CTYPE(ISO_8859_1),
     __CTYPE(ISO_8859_2),
     __CTYPE(ISO_8859_3),
@@ -70,7 +70,7 @@ const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256] =
     __CTYPE(ISO_8859_15),
     __CTYPE(ISO_8859_16),
 #endif
-#ifdef _MB_EXTENDED_CHARSETS_WINDOWS
+#ifdef __MB_EXTENDED_CHARSETS_WINDOWS
     __CTYPE(CP437),
     __CTYPE(CP720),
     __CTYPE(CP737),
@@ -99,10 +99,10 @@ const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256] =
     __CTYPE(PT154),
     __CTYPE(KOI8_T),
 #endif
-#ifdef _MB_EXTENDED_CHARSETS_JIS
+#ifdef __MB_EXTENDED_CHARSETS_JIS
     __CTYPE(EUCJP),
     __CTYPE(SJIS),
 #endif
 };
 
-#endif /* _MB_EXTENDED_CHARSETS_NON_UNICODE */
+#endif /* __MB_EXTENDED_CHARSETS_NON_UNICODE */

newlib/libc/ctype/ctype_.h

@@ -3,7 +3,7 @@
 #include <wchar.h>
 #include "locale_private.h"
 
-#ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
+#ifdef __MB_EXTENDED_CHARSETS_NON_UNICODE
 
 extern const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256];
 

newlib/libc/ctype/ctype_table.c

@@ -39,7 +39,7 @@
 #include <langinfo.h>
 #include "local.h"
 
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
 
 static struct {
     wchar_t             code;
@@ -80,4 +80,4 @@ __ctype_table_lookup(wint_t ic, locale_t locale)
     }
     return ctype_table[high].category;
 }
-#endif /* _MB_CAPABLE */
+#endif /* __MB_CAPABLE */

newlib/libc/ctype/iswalnum.c

@@ -70,7 +70,7 @@ No supporting OS subroutines are required.
 int
 iswalnum (wint_t c)
 {
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
     return iswalnum_l (c, 0);
 #else
     return c < (wint_t)0x100 ? isalnum (c) : 0;

newlib/libc/ctype/iswalnum_l.c

@@ -12,10 +12,10 @@ int
 iswalnum_l (wint_t c, locale_t locale)
 {
   (void) locale;
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
   uint16_t cat = __ctype_table_lookup (c, locale);
   return cat & CLASS_alnum;
 #else
   return c < (wint_t)0x100 ? isalnum (c) : 0;
-#endif /* _MB_CAPABLE */
+#endif /* __MB_CAPABLE */
 }

newlib/libc/ctype/iswalpha.c

@@ -70,7 +70,7 @@ No supporting OS subroutines are required.
 int
 iswalpha (wint_t c)
 {
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
     return iswalpha_l (c, 0);
 #else
     return c < (wint_t)0x100 ? isalpha (c) : 0;

newlib/libc/ctype/iswalpha_l.c

@@ -12,10 +12,10 @@ int
 iswalpha_l (wint_t c, locale_t locale)
 {
   (void) locale;
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
   uint16_t cat = __ctype_table_lookup (c, locale);
   return cat & CLASS_alpha;
 #else
   return c < (wint_t)0x100 ? isalpha (c) : 0;
-#endif /* _MB_CAPABLE */
+#endif /* __MB_CAPABLE */
 }

newlib/libc/ctype/iswblank.c

@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 int
 iswblank (wint_t c)
 {
-#ifdef _MB_CAPABLE
+#ifdef __MB_CAPABLE
   return iswblank_l (c, 0);
 #else
   return c < (wint_t)0x100 ? isblank (c) : 0;