kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MinGW build warning (#482)

Browse Source
This commit is contained in:
lanthora 2023-09-01 23:00:35 +08:00 committed by GitHub
parent a7019631b7
commit 0dd284267a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ixwebsocket/IXDNSLookup.cpp
View File

@ -27,9 +27,13 @@
// mingw build quirks // mingw build quirks
#if defined(_WIN32) && defined(__GNUC__) #if defined(_WIN32) && defined(__GNUC__)
#ifndef AI_NUMERICSERV
#define AI_NUMERICSERV NI_NUMERICSERV #define AI_NUMERICSERV NI_NUMERICSERV
#endif
#ifndef AI_ADDRCONFIG
#define AI_ADDRCONFIG LUP_ADDRCONFIG #define AI_ADDRCONFIG LUP_ADDRCONFIG
#endif #endif
#endif
namespace ix namespace ix
{ {

6
ixwebsocket/IXNetSystem.cpp
View File

@ -69,7 +69,7 @@ namespace ix
{ {
// We must deselect the networkevents from the socket event. Otherwise the // We must deselect the networkevents from the socket event. Otherwise the
// socket will report states that aren't there. // socket will report states that aren't there.
if (_fd != nullptr && _fd->fd != -1) if (_fd != nullptr && (int)_fd->fd != -1)
WSAEventSelect(_fd->fd, _event, 0); WSAEventSelect(_fd->fd, _event, 0);
WSACloseEvent(_event); WSACloseEvent(_event);
} }
@ -171,7 +171,7 @@ namespace ix
int count = 0; int count = 0;
// WSAWaitForMultipleEvents returns the index of the first signaled event. And to emulate WSAPoll() // WSAWaitForMultipleEvents returns the index of the first signaled event. And to emulate WSAPoll()
// all the signaled events must be processed. // all the signaled events must be processed.
while (socketIndex < socketEvents.size()) while (socketIndex < (int)socketEvents.size())
{ {
struct pollfd* fd = socketEvents[socketIndex]; struct pollfd* fd = socketEvents[socketIndex];
@ -345,7 +345,7 @@ namespace ix
buf[best] = buf[best + 1] = ':'; buf[best] = buf[best + 1] = ':';
memmove(buf + best + 2, buf + best + max, i - best - max + 1); memmove(buf + best + 2, buf + best + max, i - best - max + 1);
} }
if (strlen(buf) < l) if (strlen(buf) < (size_t)l)
{ {
strcpy(s, buf); strcpy(s, buf);
return s; return s;

2
ixwebsocket/IXSocketOpenSSL.cpp
View File

@ -49,7 +49,7 @@ namespace
X509_STORE* opensslStore = SSL_CTX_get_cert_store(ssl); X509_STORE* opensslStore = SSL_CTX_get_cert_store(ssl);
int certificateCount = 0; int certificateCount = 0;
while (certificateIterator = CertEnumCertificatesInStore(systemStore, certificateIterator)) while ((certificateIterator = CertEnumCertificatesInStore(systemStore, certificateIterator)))
{ {
X509* x509 = d2i_X509(NULL, X509* x509 = d2i_X509(NULL,
(const unsigned char**) &certificateIterator->pbCertEncoded, (const unsigned char**) &certificateIterator->pbCertEncoded,