MonetDB: default - Merged from Apr2011

[Fabian Groffen]

Changeset: d59cebf413a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d59cebf413a8
Modified Files:
        gdk/gdk_utils.mx
Branch: default
Log Message:

Merged from Apr2011


diffs (36 lines):

diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -494,7 +494,7 @@
                GlobalMemoryStatus(&memStat);
                _MT_npages = memStat.dwTotalPhys / _MT_pagesize;
        }
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
+#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE) && SIZEOF_SIZE_T == 
SIZEOF_LNG
        /* Darwin, 64-bits */
        {
                uint64_t size = 0;
@@ -508,7 +508,7 @@
                sysctl(mib, 2, &size, &len, NULL, 0);
                _MT_npages = size / _MT_pagesize;
        }
-#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64)
+#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64) && SIZEOF_SIZE_T == 
SIZEOF_LNG
        /* OpenBSD, 64-bits */
        {
                int64_t size = 0;
@@ -523,9 +523,13 @@
                _MT_npages = size / _MT_pagesize;
        }
 #elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PHYSMEM)
-       /* FreeBSD, NetBSD, OpenBSD, Darwin, 32-bits */
+       /* NetBSD, OpenBSD, Darwin, 32-bits; FreeBSD 32 & 64-bits */
        {
+# ifdef __FreeBSD__
+               unsigned long size = 0
+# else
                int size = 0;
+# endif
                size_t len = sizeof(size);
                int mib[2];
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list