summaryrefslogtreecommitdiff
path: root/src/basic/utf8.h
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-11-02 11:31:10 +0100
committerDaniel Mack <github@zonque.org>2015-11-02 11:31:10 +0100
commit117b94060da6ec4bacbc2319264bb0f921ce7bf1 (patch)
tree71b9701b5a4732c29ee2d6c1f87b9aba99a2c630 /src/basic/utf8.h
parent85e3351f79dc984239c1861377c22eb7c86011f2 (diff)
parentdcd12626734ce81e89c74515eaca601ef9edf785 (diff)
Merge pull request #1750 from systemd/revert-1740-master
Revert "utf8.[ch]: use char32_t and char16_t instead of int, int32_t,…
Diffstat (limited to 'src/basic/utf8.h')
-rw-r--r--src/basic/utf8.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index 20d38f12c8..e745649f06 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -22,13 +22,12 @@
***/
#include <stdbool.h>
-#include <uchar.h>
#include "macro.h"
#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
-bool unichar_is_valid(char32_t c);
+bool unichar_is_valid(uint32_t c);
const char *utf8_is_valid(const char *s) _pure_;
char *ascii_is_valid(const char *s) _pure_;
@@ -39,20 +38,20 @@ bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pu
char *utf8_escape_invalid(const char *s);
char *utf8_escape_non_printable(const char *str);
-size_t utf8_encode_unichar(char *out_utf8, char32_t g);
+size_t utf8_encode_unichar(char *out_utf8, uint32_t g);
char *utf16_to_utf8(const void *s, size_t length);
int utf8_encoded_valid_unichar(const char *str);
-char32_t utf8_encoded_to_unichar(const char *str);
+int utf8_encoded_to_unichar(const char *str);
-static inline bool utf16_is_surrogate(char16_t c) {
+static inline bool utf16_is_surrogate(uint16_t c) {
return (0xd800 <= c && c <= 0xdfff);
}
-static inline bool utf16_is_trailing_surrogate(char16_t c) {
+static inline bool utf16_is_trailing_surrogate(uint16_t c) {
return (0xdc00 <= c && c <= 0xdfff);
}
-static inline char32_t utf16_surrogate_pair_to_unichar(char16_t lead, char16_t trail) {
+static inline uint32_t utf16_surrogate_pair_to_unichar(uint16_t lead, uint16_t trail) {
return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000;
}