Changeset: d9ef26634dd1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9ef26634dd1
Modified Files:
gdk/gdk_utils.mx
Branch: Apr2011
Log Message:
pagesize: first check using sysctl, before using sysconf
On Darwin the latter returns 0, whereas the former returns 4096, so make
sure the first is used in case both are available.
diffs (25 lines):
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -463,10 +463,7 @@
_MT_pagesize = sysInfo.dwPageSize;
}
#else
-# if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
- _MT_pagesize = sysconf(_SC_PAGESIZE);
-# else
-# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_PAGESIZE)
+# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_PAGESIZE)
{
int size;
size_t len = sizeof(size);
@@ -474,6 +471,9 @@
sysctlbyname("hw.pagesize", &size, &len, NULL, 0);
_MT_pagesize = size;
}
+# else
+# if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
+ _MT_pagesize = sysconf(_SC_PAGESIZE);
# endif
# endif
#endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
