Changeset: cf3d41542092 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf3d41542092
Modified Files:
gdk/gdk_utils.c
tools/merovingian/utils/utils.c
Branch: default
Log Message:
Fix compilation in FreeBSD
diffs (31 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -573,8 +573,8 @@ MT_init(void)
struct rlimit l;
/* address space (virtual memory) limit */
if (getrlimit(RLIMIT_AS, &l) == 0
- && l.rlim_cur != RLIM_INFINITY
- && l.rlim_cur < GDK_vm_maxsize) {
+ && (size_t)l.rlim_cur != RLIM_INFINITY
+ && (size_t)l.rlim_cur < GDK_vm_maxsize) {
GDK_vm_maxsize = l.rlim_cur;
}
#endif
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -35,6 +35,13 @@
#endif
#endif
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifdef BSD /* BSD macro is defined in sys/param.h */
+# include <sys/stat.h> /* Needed for S_IRUSR, S_IWUSR */
+#endif
+
#ifndef O_CLOEXEC
#define O_CLOEXEC 0
#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
