1 files changed, 19 insertions, 17 deletions

diff --git a/sntp/libevent/test/regress_util.c b/sntp/libevent/test/regress_util.c
index d64d002..60f085b 100644
--- a/sntp/libevent/test/regress_util.c
+++ b/sntp/libevent/test/regress_util.c
@@ -179,10 +179,10 @@ regress_ipv6_parse(void *ptr)
 		for (j = 0; j < 4; ++j) {
 			/* Can't use s6_addr32 here; some don't have it. */
 			ev_uint32_t u =
-				(in6.s6_addr[j*4  ] << 24) |
-				(in6.s6_addr[j*4+1] << 16) |
-				(in6.s6_addr[j*4+2] << 8) |
-				(in6.s6_addr[j*4+3]);
+			    ((ev_uint32_t)in6.s6_addr[j*4  ] << 24) |
+			    ((ev_uint32_t)in6.s6_addr[j*4+1] << 16) |
+			    ((ev_uint32_t)in6.s6_addr[j*4+2] << 8) |
+			    ((ev_uint32_t)in6.s6_addr[j*4+3]);
 			if (u != ent->res[j]) {
 				TT_FAIL(("%s did not parse as expected.", ent->addr));
 				continue;
@@ -726,46 +726,48 @@ test_evutil_integers(void *arg)
 	tt_assert(u64 > 0);
 	tt_assert(i64 > 0);
 	u64++;
-	i64++;
+/*	i64++; */
 	tt_assert(u64 == 0);
-	tt_assert(i64 == EV_INT64_MIN);
-	tt_assert(i64 < 0);
+/*	tt_assert(i64 == EV_INT64_MIN); */
+/*	tt_assert(i64 < 0); */
 
 	u32 = EV_UINT32_MAX;
 	i32 = EV_INT32_MAX;
 	tt_assert(u32 > 0);
 	tt_assert(i32 > 0);
 	u32++;
-	i32++;
+/*	i32++; */
 	tt_assert(u32 == 0);
-	tt_assert(i32 == EV_INT32_MIN);
-	tt_assert(i32 < 0);
+/*	tt_assert(i32 == EV_INT32_MIN); */
+/*	tt_assert(i32 < 0); */
 
 	u16 = EV_UINT16_MAX;
 	i16 = EV_INT16_MAX;
 	tt_assert(u16 > 0);
 	tt_assert(i16 > 0);
 	u16++;
-	i16++;
+/*	i16++; */
 	tt_assert(u16 == 0);
-	tt_assert(i16 == EV_INT16_MIN);
-	tt_assert(i16 < 0);
+/*	tt_assert(i16 == EV_INT16_MIN); */
+/* 	tt_assert(i16 < 0); */
 
 	u8 = EV_UINT8_MAX;
 	i8 = EV_INT8_MAX;
 	tt_assert(u8 > 0);
 	tt_assert(i8 > 0);
 	u8++;
-	i8++;
+/*	i8++;*/
 	tt_assert(u8 == 0);
-	tt_assert(i8 == EV_INT8_MIN);
-	tt_assert(i8 < 0);
+/*	tt_assert(i8 == EV_INT8_MIN); */
+/*	tt_assert(i8 < 0); */
 
+/*
 	ssize = EV_SSIZE_MAX;
 	tt_assert(ssize > 0);
 	ssize++;
 	tt_assert(ssize < 0);
 	tt_assert(ssize == EV_SSIZE_MIN);
+*/
 
 	ptr = &ssize;
 	iptr = (ev_intptr_t)ptr;
@@ -1119,7 +1121,7 @@ end:
 static void
 test_evutil_loadsyslib(void *arg)
 {
-	HANDLE h=NULL;
+	HMODULE h=NULL;
 
 	h = evutil_load_windows_system_library_(TEXT("kernel32.dll"));
 	tt_assert(h);