fix windows build (#29)

* fix windows build

* fix for Unix

* Fix build if TLS is OFF

* add OpenSSL req to ws

* Fix build on Mac

* fix tests for windows
This commit is contained in:
Dimon4eg
2019-04-16 18:51:57 +03:00
committed by Benjamin Sergeant
parent dac18fcabf
commit fbb7c012a3
12 changed files with 80 additions and 40 deletions

View File

@ -73,7 +73,7 @@ TEST_CASE("socket", "[socket]")
testSocket(host, port, request, socket, expectedStatus, timeoutSecs);
}
#if defined(__APPLE__) or defined(__linux__)
#if defined(__APPLE__) || defined(__linux__)
SECTION("Connect to google HTTPS server. Send GET request without header. Should return 200")
{
std::string errMsg;

View File

@ -109,7 +109,7 @@ namespace ix
}
struct sockaddr_in sa; // server address information
unsigned int len;
socklen_t len;
if (getsockname(sockfd, (struct sockaddr *) &sa, &len) < 0)
{
log("Cannot compute a free port. getsockname error.");

View File

@ -7,8 +7,6 @@
#define CATCH_CONFIG_RUNNER
#include "catch.hpp"
#include <ixwebsocket/IXSocket.h>
int main(int argc, char* argv[])
{
int result = Catch::Session().run(argc, argv);