Fix a couple of Windows compilation issues

This commit is contained in:
Dmitri Tikhonov 2019-04-12 14:31:08 -04:00
parent 9b4d33c76c
commit e5d4bc6d21
2 changed files with 16 additions and 1 deletions

View file

@ -75,7 +75,14 @@ lsquic_iquic_parse_packet_in_long_begin (lsquic_packet_in_t *packet_in,
header_type = bits2ht[ (first_byte >> 4) & 3 ]; header_type = bits2ht[ (first_byte >> 4) & 3 ];
} }
else else
{
header_type = HETY_VERNEG; header_type = HETY_VERNEG;
#ifdef WIN32
/* Useless initialization: */
version = -1;
#endif
}
packet_in->pi_header_type = header_type; packet_in->pi_header_type = header_type;
@ -125,6 +132,10 @@ lsquic_iquic_parse_packet_in_long_begin (lsquic_packet_in_t *packet_in,
/* Need at least one version in the version array: add 4 */ /* Need at least one version in the version array: add 4 */
if (end - p < (ptrdiff_t) (dcil + scil + 4)) if (end - p < (ptrdiff_t) (dcil + scil + 4))
return -1; return -1;
#ifdef WIN32
/* Useless initialization: */
packet_len = 0;
#endif
} }
memcpy(&packet_in->pi_conn_id, p, cid_len); memcpy(&packet_in->pi_conn_id, p, cid_len);

View file

@ -38,7 +38,6 @@ SET(TESTS
hkdf hkdf
lsquic_hash lsquic_hash
malo malo
qlog
packet_out packet_out
packno_len packno_len
parse_packet_in parse_packet_in
@ -68,6 +67,11 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
SET(TESTS ${TESTS} frame_rw) SET(TESTS ${TESTS} frame_rw)
ENDIF() ENDIF()
IF (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
# Linux has fmemopen
SET(TESTS ${TESTS} qlog)
ENDIF()
FOREACH(TEST_NAME ${TESTS}) FOREACH(TEST_NAME ${TESTS})
ADD_EXECUTABLE(test_${TEST_NAME} test_${TEST_NAME}.c ${ADDL_SOURCES}) ADD_EXECUTABLE(test_${TEST_NAME} test_${TEST_NAME}.c ${ADDL_SOURCES})