merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions

View file

@ -15,6 +15,8 @@
#include <string.h>
#include <time.h>
#ifdef __cplusplus
#include <algorithm>
#include <array>
#include <atomic>
@ -194,3 +196,5 @@
#ifdef _WIN32
#include "GUI/format.hpp"
#endif // _WIN32
#endif // __cplusplus