Skip to content

Commit

Permalink
Fix issue #20: type cast in send(), add WSAStartup, and add CRTSECURE…
Browse files Browse the repository at this point in the history
…_NO_WARNINGS for MSVC2013.
  • Loading branch information
dhbaird committed Nov 12, 2013
1 parent 771ccaa commit 7cbf090
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
4 changes: 3 additions & 1 deletion easywsclient.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "easywsclient.hpp"

#ifdef _WIN32
// CRTSECURE_NO_WARNINGS for sscanf errors in MSVC2013 Express
#define CRTSECURE_NO_WARNINGS
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
Expand Down Expand Up @@ -203,7 +205,7 @@ class _RealWebSocket : public easywsclient::WebSocket
while (txbuf.size()) {
int ret;
#ifdef _WIN32
ret = ::send(sockfd, (int8_t*)&txbuf[0], txbuf.size(), 0);
ret = ::send(sockfd, (char*)&txbuf[0], txbuf.size(), 0);
#else
ret = ::send(sockfd, &txbuf[0], txbuf.size(), 0);
#endif
Expand Down
18 changes: 18 additions & 0 deletions example-client-cpp11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
// g++ -std=gnu++0x example-client-cpp11.cpp -o example-client-cpp11
#include "easywsclient.hpp"
//#include "easywsclient.cpp" // <-- include only if you don't want compile separately
#ifdef _WIN32
#pragma comment( lib, "ws2_32" )
#include <WinSock2.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <string>
Expand All @@ -10,6 +14,17 @@
int main()
{
using easywsclient::WebSocket;
#ifdef _WIN32
INT rc;
WSADATA wsaData;

rc = WSAStartup(MAKEWORD(2, 2), &wsaData);
if (rc) {
printf("WSAStartup Failed.\n");
return 1;
}
#endif

std::unique_ptr<WebSocket> ws(WebSocket::from_url("ws://localhost:8126/foo"));
assert(ws);
ws->send("goodbye");
Expand All @@ -22,6 +37,9 @@ int main()
if (message == "world") { wsp->close(); }
});
}
#ifdef _WIN32
WSACleanup();
#endif
// N.B. - unique_ptr will free the WebSocket instance upon return:
return 0;
}

0 comments on commit 7cbf090

Please sign in to comment.