Skip to content

Commit fb49ea2

Browse files
committed
msvc, mingw: fix compilation issues
``` ../src/arvnetwork.c(475): warning C4133: 'function': incompatible types - from 'DWORD *' to 'char *' ../src/arvnetwork.c(492): error C2121: '#': invalid character: possibly the result of a macro expansion ../src/arvnetwork.c(492): error C2146: syntax error: missing ')' before identifier 'ifndef' ../src/arvnetwork.c(492): error C2059: syntax error: ')' ```
1 parent d573a03 commit fb49ea2

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/arvnetwork.c

+10-5
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ arv_socket_set_recv_buffer_size (int socket_fd, gint buffer_size)
463463
optlen = sizeof(buffer_size_reported);
464464

465465
result = setsockopt (socket_fd, SOL_SOCKET, SO_RCVBUF,
466-
(const char*) &_buffer_size, sizeof (_buffer_size));
466+
(const char *) &_buffer_size, sizeof (_buffer_size));
467467
if(result != 0) {
468468
arv_warning_interface ("[set_recv_buffer_size] Setting socket buffer to %d bytes failed (%s)",
469469
_buffer_size, strerror(errno));
@@ -472,7 +472,7 @@ arv_socket_set_recv_buffer_size (int socket_fd, gint buffer_size)
472472

473473
/* setsockopt() succeeded, but sometimes the requested size is not actually be set. Ask
474474
* to see the new setting to confirm. */
475-
result = getsockopt (socket_fd, SOL_SOCKET, SO_RCVBUF, &buffer_size_reported, &optlen);
475+
result = getsockopt (socket_fd, SOL_SOCKET, SO_RCVBUF, (char *) &buffer_size_reported, &optlen);
476476
if (result != 0) {
477477
arv_warning_interface ("[set_recv_buffer_size] Read of socket buffer size (SO_RCVBUF) failed (%s)",
478478
strerror(errno));
@@ -482,14 +482,19 @@ arv_socket_set_recv_buffer_size (int socket_fd, gint buffer_size)
482482

483483
if(buffer_size_reported < buffer_size)
484484
{
485+
#ifndef G_OS_WIN32
485486
arv_warning_interface ("[set_recv_buffer_size] Unexpected socket buffer size (SO_RCVBUF):"
486487
" actual %d < expected %d bytes"
487488
"\nYou might see missing packets and timeouts"
488-
#ifndef G_OS_WIN32
489489
"\nMost likely /proc/sys/net/core/rmem_max is too low"
490-
"\nSee the socket(7) manpage\n"
490+
"\nSee the socket(7) manpage\n",
491+
buffer_size_reported, buffer_size);
492+
#else
493+
arv_warning_interface ("[set_recv_buffer_size] Unexpected socket buffer size (SO_RCVBUF):"
494+
" actual %d < expected %d bytes"
495+
"\nYou might see missing packets and timeouts",
496+
buffer_size_reported, buffer_size);
491497
#endif
492-
, buffer_size_reported, buffer_size);
493498

494499
return FALSE;
495500
}

0 commit comments

Comments
 (0)