Changeset: 65fd1c1dbd3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/65fd1c1dbd3c
Modified Files:
clients/mapilib/connect.c
Branch: odbc-tls
Log Message:
it seems setsockopt on windows needs char*, while descent systems have void *
diffs (16 lines):
diff --git a/clients/mapilib/connect.c b/clients/mapilib/connect.c
--- a/clients/mapilib/connect.c
+++ b/clients/mapilib/connect.c
@@ -356,9 +356,10 @@ connect_socket_tcp_addr(Mapi mid, struct
.tv_sec = timeout / 1000,
.tv_usec = timeout % 1000,
};
+ /* cast to char * for Windows, no harm on "normal" systems */
if (
- setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv))
== SOCKET_ERROR
- || setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv,
sizeof(tv)) == SOCKET_ERROR
+ setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char*)&tv,
sizeof(tv)) == SOCKET_ERROR
+ || setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char*)&tv,
sizeof(tv)) == SOCKET_ERROR
) {
closesocket(s);
return mapi_printError(
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
