Changeset: d2d17f818097 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2d17f818097
Modified Files:
MonetDB.spec
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:
Fix merge changeset 61310c2fc0e0.
diffs (28 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -75,9 +75,9 @@
%bcond_without rintegration
%endif
-%if %{?rhel:0}%{!?rhel:1}
-# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
-# is too old (in both cases 3.4).
+%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
+# On RHEL 6, Python 3 is too old. On RHEL 7, Python 3 was too old
+# when RHEL 7 was released, but now it is ok.
%bcond_without py3integration
%endif
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -921,7 +921,7 @@ SERVERlisten(int port, const char *usock
throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
- gethostname(host, (int) 512);
+ gethostname(host, sizeof(host));
TRC_DEBUG_ENDIF(MAL_SERVER, "Ready to accept connections on: %s:%d\n",
host, port);
/* seed the randomiser such that our challenges aren't
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
