remove merge conflict artifacts, prefix MwIsKeyUTF8
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
This commit is contained in:
parent
597dbe4e5a
commit
2e30d7f4d9
4 changed files with 6 additions and 8 deletions
|
|
@ -50,7 +50,7 @@ void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...) {
|
|||
va_end(va);
|
||||
};
|
||||
|
||||
MWDECL MwBool MwIsKeyUTF8(MwU32 key) {
|
||||
MWDECL MwBool MwStringIsKeyUTF8(MwU32 key) {
|
||||
unsigned char bytes[sizeof(MwU32)];
|
||||
memcpy(bytes, &key, sizeof(MwU32));
|
||||
int i = 0;
|
||||
|
|
@ -111,4 +111,3 @@ MWDECL MwBool MwIsKeyUTF8(MwU32 key) {
|
|||
|
||||
return 1;
|
||||
}
|
||||
>>>>>>> master
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue