iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Windows build

Browse source
This commit is contained in:
Dmitri Tikhonov 2020-10-07 11:05:18 -04:00
parent e55a45021d
commit 464a1af9c4
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -103,6 +103,7 @@ SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4334") # result of 32-bit shift implici
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4456") # hide previous local declaration SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4456") # hide previous local declaration
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4459") # hide global declaration SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4459") # hide global declaration
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4706") # assignment within conditional expression SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4706") # assignment within conditional expression
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4090") # different 'const' qualifier (TODO: debug ls-sfparser.c)
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -W4 -WX -Zi -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -I${CMAKE_CURRENT_SOURCE_DIR}/wincompat") SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -W4 -WX -Zi -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -I${CMAKE_CURRENT_SOURCE_DIR}/wincompat")
IF(CMAKE_BUILD_TYPE STREQUAL "Debug") IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od") SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od")

4
src/liblsquic/lsquic_handshake.c
View file

@ -11,6 +11,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <sys/socket.h> #include <sys/socket.h>
#else
#include <malloc.h>
#endif #endif
#include <openssl/ssl.h> #include <openssl/ssl.h>
@ -1977,7 +1979,7 @@ gen_rej1_data (struct lsquic_enc_session *enc_session, uint8_t *data,
#ifndef WIN32 #ifndef WIN32
char prof_buf[prof_len]; char prof_buf[prof_len];
#else #else
prof_buf = _malloca(prof_len); char *prof_buf = _malloca(prof_len);
if (!prof_buf) if (!prof_buf)
return -1; return -1;
#endif #endif

4
tests/test_h3_framing.c
View file

@ -1223,11 +1223,11 @@ test_frame_header_split (unsigned n_packets, unsigned extra_sz,
const ssize_t w = lsquic_stream_write(stream, buf_in, buf_in_sz); const ssize_t w = lsquic_stream_write(stream, buf_in, buf_in_sz);
assert(w >= 0 && (size_t) w == buf_in_sz); assert(w >= 0 && (size_t) w == buf_in_sz);
n_frames = count_hq_frames(stream); n_frames = count_hq_frames(stream);
assert(n_frames == 1 + (w > 0)); assert((int) n_frames == 1 + (w > 0));
lsquic_stream_flush(stream); lsquic_stream_flush(stream);
n_frames = count_hq_frames(stream); n_frames = count_hq_frames(stream);
assert(n_frames == !!stream->sm_n_buffered); assert((int) n_frames == !!stream->sm_n_buffered);
if (add_one_more) if (add_one_more)
{ {