Changeset 29e7cc7 in mainline for common/include/uchar.h

Timestamp:

2025-04-18T15:14:10Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream/master' into helenraid

File:

• common/include/uchar.h (moved) (moved from kernel/generic/include/uchar.h ) (3 diffs)

common/include/uchar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Martin Decky
+ * Copyright (c) 2025 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kernel_generic
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef _KERN_UCHAR_H_
-#define _KERN_UCHAR_H_
+#ifndef _LIBC_UCHAR_H_
+#define _LIBC_UCHAR_H_
 
+#include <_bits/mbstate_t.h>
+#include <_bits/size_t.h>
 #include <_bits/uchar.h>
+#include <stdint.h>
+
+size_t mbrtoc8(char8_t *__restrict pc8, const char *__restrict s, size_t n,
+    mbstate_t *__restrict ps);
+size_t c8rtomb(char *__restrict s, char8_t c8, mbstate_t *__restrict ps);
+size_t mbrtoc16(char16_t *__restrict pc16, const char *__restrict s, size_t n,
+    mbstate_t *__restrict ps);
+size_t c16rtomb(char *__restrict s, char16_t c16, mbstate_t *__restrict ps);
+size_t mbrtoc32(char32_t *__restrict pc32, const char *__restrict s, size_t n,
+    mbstate_t *__restrict ps);
+size_t c32rtomb(char *__restrict s, char32_t c32, mbstate_t *__restrict ps);
+
+#ifdef _HELENOS_SOURCE
+#define UCHAR_ILSEQ      ((size_t) -1)
+#define UCHAR_INCOMPLETE ((size_t) -2)
+#define UCHAR_CONTINUED  ((size_t) -3)
+#endif
 
 #endif