80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Use platform string comparison functions

Browse Source
This commit is contained in:
Cacodemon345
2021-12-24 14:16:10 +06:00
parent 13d75c2e4f
commit 0402048629
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/qt/qt.c
View File

@@ -5,6 +5,7 @@
#if !defined(_WIN32) || !defined(__clang__) #if !defined(_WIN32) || !defined(__clang__)
#include <strings.h> #include <strings.h>
#endif #endif
#include <string.h>
#include <stdint.h> #include <stdint.h>
#include <wchar.h> #include <wchar.h>

16
src/qt/qt_platform.cpp
View File

@@ -54,6 +54,8 @@ extern "C" {
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <windows.h>
#else
#include <strings.h>
#endif #endif
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/device.h> #include <86box/device.h>
@@ -79,14 +81,20 @@ uint32_t lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for
int stricmp(const char* s1, const char* s2) int stricmp(const char* s1, const char* s2)
{ {
return QByteArray(s1).compare(s2, Qt::CaseInsensitive); #ifdef Q_OS_WINDOWS
return _stricmp(s1, s2);
#else
return strcasecmp(s1, s2);
#endif
} }
int strnicmp(const char *s1, const char *s2, size_t n) int strnicmp(const char *s1, const char *s2, size_t n)
{ {
QByteArray b1(s1, std::min(strlen(s1), n)); #ifdef Q_OS_WINDOWS
QByteArray b2(s2, std::min(strlen(s2), n)); return _strnicmp(s1, s2, n);
return b1.compare(b2, Qt::CaseInsensitive); #else
return strncasecmp(s1, s2, n);
#endif
} }
void void