diff options
Diffstat (limited to 'src/microhttpd')
-rw-r--r-- | src/microhttpd/test_client_put_stop.c | 6 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade.c | 8 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade_large.c | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/microhttpd/test_client_put_stop.c b/src/microhttpd/test_client_put_stop.c index 03a9e87c..b4167870 100644 --- a/src/microhttpd/test_client_put_stop.c +++ b/src/microhttpd/test_client_put_stop.c | |||
@@ -2011,7 +2011,7 @@ static int | |||
2011 | testInternalGet (enum testMhdPollType pollType) | 2011 | testInternalGet (enum testMhdPollType pollType) |
2012 | { | 2012 | { |
2013 | struct MHD_Daemon *d; | 2013 | struct MHD_Daemon *d; |
2014 | int d_port = global_port; /* Daemon's port */ | 2014 | uint16_t d_port = global_port; /* Daemon's port */ |
2015 | struct ahc_cls_type *ahc_param; | 2015 | struct ahc_cls_type *ahc_param; |
2016 | struct check_uri_cls *uri_cb_param; | 2016 | struct check_uri_cls *uri_cb_param; |
2017 | struct term_notif_cb_param *term_result; | 2017 | struct term_notif_cb_param *term_result; |
@@ -2027,7 +2027,7 @@ static int | |||
2027 | testMultithreadedGet (enum testMhdPollType pollType) | 2027 | testMultithreadedGet (enum testMhdPollType pollType) |
2028 | { | 2028 | { |
2029 | struct MHD_Daemon *d; | 2029 | struct MHD_Daemon *d; |
2030 | int d_port = global_port; /* Daemon's port */ | 2030 | uint16_t d_port = global_port; /* Daemon's port */ |
2031 | struct ahc_cls_type *ahc_param; | 2031 | struct ahc_cls_type *ahc_param; |
2032 | struct check_uri_cls *uri_cb_param; | 2032 | struct check_uri_cls *uri_cb_param; |
2033 | struct term_notif_cb_param *term_result; | 2033 | struct term_notif_cb_param *term_result; |
@@ -2042,7 +2042,7 @@ static int | |||
2042 | testMultithreadedPoolGet (enum testMhdPollType pollType) | 2042 | testMultithreadedPoolGet (enum testMhdPollType pollType) |
2043 | { | 2043 | { |
2044 | struct MHD_Daemon *d; | 2044 | struct MHD_Daemon *d; |
2045 | int d_port = global_port; /* Daemon's port */ | 2045 | uint16_t d_port = global_port; /* Daemon's port */ |
2046 | struct ahc_cls_type *ahc_param; | 2046 | struct ahc_cls_type *ahc_param; |
2047 | struct check_uri_cls *uri_cb_param; | 2047 | struct check_uri_cls *uri_cb_param; |
2048 | struct term_notif_cb_param *term_result; | 2048 | struct term_notif_cb_param *term_result; |
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 49a17dbe..fb4bdadf 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -1196,8 +1196,12 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon) | |||
1196 | &to64); | 1196 | &to64); |
1197 | if (1000 < to64) | 1197 | if (1000 < to64) |
1198 | to64 = 1000; | 1198 | to64 = 1000; |
1199 | tv.tv_sec = to64 / 1000; | 1199 | #if ! defined(_WIN32) || defined(__CYGWIN__) |
1200 | tv.tv_usec = 1000 * (to64 % 1000); | 1200 | tv.tv_sec = (time_t) (to64 / 1000); |
1201 | #else /* Native W32 */ | ||
1202 | tv.tv_sec = (long) (to64 / 1000); | ||
1203 | #endif /* Native W32 */ | ||
1204 | tv.tv_usec = (int) (1000 * (to64 % 1000)); | ||
1201 | ret = select (ep + 1, | 1205 | ret = select (ep + 1, |
1202 | &rs, | 1206 | &rs, |
1203 | NULL, | 1207 | NULL, |
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c index 275434c8..2374574e 100644 --- a/src/microhttpd/test_upgrade_large.c +++ b/src/microhttpd/test_upgrade_large.c | |||
@@ -1382,8 +1382,12 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon) | |||
1382 | &to64); | 1382 | &to64); |
1383 | if (1000 < to64) | 1383 | if (1000 < to64) |
1384 | to64 = 1000; | 1384 | to64 = 1000; |
1385 | tv.tv_sec = to64 / 1000; | 1385 | #if ! defined(_WIN32) || defined(__CYGWIN__) |
1386 | tv.tv_usec = 1000 * (to64 % 1000); | 1386 | tv.tv_sec = (time_t) (to64 / 1000); |
1387 | #else /* Native W32 */ | ||
1388 | tv.tv_sec = (long) (to64 / 1000); | ||
1389 | #endif /* Native W32 */ | ||
1390 | tv.tv_usec = (int) (1000 * (to64 % 1000)); | ||
1387 | ret = select (ep + 1, | 1391 | ret = select (ep + 1, |
1388 | &rs, | 1392 | &rs, |
1389 | NULL, | 1393 | NULL, |