Changeset: e559b6b9ddf5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e559b6b9ddf5
Modified Files:
clients/mapilib/connect.c
clients/mapilib/msettings.c
Branch: monetdburl
Log Message:
Windows fixes
diffs (26 lines):
diff --git a/clients/mapilib/connect.c b/clients/mapilib/connect.c
--- a/clients/mapilib/connect.c
+++ b/clients/mapilib/connect.c
@@ -337,7 +337,8 @@ connect_socket_tcp_addr(Mapi mid, struct
(void) fcntl(s, F_SETFD, FD_CLOEXEC);
#endif
- if (connect(s, info->ai_addr, info->ai_addrlen) == SOCKET_ERROR) {
+ // cast addrlen to int to satisfy Windows.
+ if (connect(s, info->ai_addr, (int)info->ai_addrlen) == SOCKET_ERROR) {
mapi_printError(
mid, __func__, MERROR,
"could not connect: %s", SOCKET_STRERROR());
diff --git a/clients/mapilib/msettings.c b/clients/mapilib/msettings.c
--- a/clients/mapilib/msettings.c
+++ b/clients/mapilib/msettings.c
@@ -10,7 +10,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
+#endif
#define FATAL() do { fprintf(stderr, "\n\n abort in params.c: %s\n\n",
__func__); abort(); } while (0)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
