Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-29 01:06:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows building

Browse Source 
Regression occured in 3a92e4
This commit is contained in:
Jonathan White 2018-04-26 23:04:36 -04:00
parent 056bbaa921
commit 062503a903
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -276,7 +276,7 @@ if (UNIX AND NOT APPLE)
target_link_libraries(keepassx_core Qt5::DBus) target_link_libraries(keepassx_core Qt5::DBus)
endif() endif()
if(MINGW) if(MINGW)
target_link_libraries(keepassx_core Wtsapi32.lib) target_link_libraries(keepassx_core Wtsapi32.lib Ws2_32.lib)
endif() endif()
if(MINGW) if(MINGW)

6
src/browser/NativeMessagingHost.cpp
View File

@ -23,6 +23,10 @@
#include "NativeMessagingHost.h" #include "NativeMessagingHost.h"
#include "BrowserSettings.h" #include "BrowserSettings.h"
#ifdef Q_OS_WIN
#include <Winsock2.h>
#endif
NativeMessagingHost::NativeMessagingHost(DatabaseTabWidget* parent) : NativeMessagingHost::NativeMessagingHost(DatabaseTabWidget* parent) :
NativeMessagingBase(), NativeMessagingBase(),
m_mutex(QMutex::Recursive), m_mutex(QMutex::Recursive),
@ -150,7 +154,7 @@ void NativeMessagingHost::newLocalMessage()
int socketDesc = socket->socketDescriptor(); int socketDesc = socket->socketDescriptor();
if (socketDesc) { if (socketDesc) {
int max = NATIVE_MSG_MAX_LENGTH; int max = NATIVE_MSG_MAX_LENGTH;
setsockopt(socketDesc, SOL_SOCKET, SO_SNDBUF, &max, sizeof(max)); setsockopt(socketDesc, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<char*>(&max), sizeof(max));
} }
QByteArray arr = socket->readAll(); QByteArray arr = socket->readAll();