Changeset: e359129282d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e359129282d5
Modified Files:
Branch: default
Log Message:
Merge with default
diffs (29 lines):
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -506,6 +506,12 @@
mib[0] = CTL_HW;
mib[1] = HW_MEMSIZE;
sysctl(mib, 2, &size, &len, NULL, 0);
+# ifdef SIZEOF_SIZE_T == SIZEOF_INT
+ /* we can have more memory than a size_t can handle on a 32-bits
+ * platform, so trim it down, if that is the case */
+ if (size > 0xffffffff)
+ size = 0xffffffff;
+# endif
_MT_npages = size / _MT_pagesize;
}
#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64)
@@ -520,6 +526,12 @@
mib[0] = CTL_HW;
mib[1] = HW_PHYSMEM64;
sysctl(mib, 2, &size, &len, NULL, 0);
+# ifdef SIZEOF_SIZE_T == SIZEOF_INT
+ /* we can have more memory than a size_t can handle on a 32-bits
+ * platform, so trim it down, if that is the case */
+ if (size > 0xffffffff)
+ size = 0xffffffff;
+# endif
_MT_npages = size / _MT_pagesize;
}
#elif defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
