pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

merge conflict
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
IoI_xD 2026-03-30 11:32:40 -07:00
commit 597dbe4e5a
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/string.c
View file

@ -37,7 +37,6 @@ void MwStringTime(char* out, time_t t) {
sprintf(out, "%s %2d %02d:%02d %d", months[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, 1900 + tm->tm_year); sprintf(out, "%s %2d %02d:%02d %d", months[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, 1900 + tm->tm_year);
} }
} }
<<<<<<< HEAD
void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...) { void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...) {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
@ -50,7 +49,6 @@ void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...) {
va_end(va); va_end(va);
}; };
=======
MWDECL MwBool MwIsKeyUTF8(MwU32 key) { MWDECL MwBool MwIsKeyUTF8(MwU32 key) {
unsigned char bytes[sizeof(MwU32)]; unsigned char bytes[sizeof(MwU32)];