stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes for building with MinGW

Browse source 
Added fixes to avoid compile errors and warnings when building under
Windows using MinGW
This commit is contained in:
Stephan Eberle 2016-04-26 22:05:19 +02:00 • committed by Andy Green
parent 734f10a19b
commit 3f41a9de5b
4 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -49,6 +49,7 @@ if(GIT_EXECUTABLE)
OUTPUT_VARIABLE GIT_HOST
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
message("Git commit hash: ${LWS_BUILD_HASH}")
endif()

1
lib/lws-plat-win.c
View file

@ -541,7 +541,6 @@ _lws_plat_file_read(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
{
DWORD _amount;
(void *)wsi;
if (!ReadFile((HANDLE)fd, buf, (DWORD)len, &_amount, NULL)) {
*amount = 0;

1
lib/server.c
View file

@ -233,7 +233,6 @@ int lws_http_serve(struct lws *wsi, char *uri, const char *origin)
char path[256], sym[256];
unsigned char *p = (unsigned char *)sym + 32 + LWS_PRE, *start = p;
unsigned char *end = p + sizeof(sym) - 32 - LWS_PRE;
size_t len;
int n, spin = 0;
snprintf(path, sizeof(path) - 1, "%s/%s", origin, uri);

2
win32port/win32helpers/gettimeofday.h
View file

@ -7,6 +7,8 @@
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
#include <winsock2.h>
#ifndef _TIMEZONE_DEFINED
struct timezone
{