Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11313/conf
Modified Files:
Tag: MonetDB_1-22
MonetDB.m4
Log Message:
Changed the way we check for and use mallinfo(): If mallinfo() returns
a struct with fields which are too small to hold the information it is
supposed to return (e.g. 32 bits on a 64-bit system), we ignore
mallinfo(). Also, we use our own struct to hold the information, so
that the rest of the software can rely on bot the presence of the
struct and the types of the fields.
This also results in one interface change: the view_gdk_memory() and
memory() functions in M4 and the memStatistics() function in M5 now
return a BAT with a wrd tail instead of int.
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -u -d -r1.64.2.1 -r1.64.2.2
--- MonetDB.m4 3 Feb 2008 12:16:18 -0000 1.64.2.1
+++ MonetDB.m4 12 Feb 2008 09:23:49 -0000 1.64.2.2
@@ -2343,7 +2343,9 @@
save_LIBS="$LIBS"
LIBS="$LIBS $MALLOC_LIBS"
-AC_CHECK_FUNCS(mallopt mallinfo)
+AC_CHECK_FUNCS(mallopt)
+AC_CHECK_FUNC(mallinfo, AC_TRY_COMPILE([$ac_includes_default
+#include <malloc.h>], [struct mallinfo m;int
x[[1+sizeof(m.usmblks)-sizeof(void *)]]], AC_DEFINE(HAVE_USEFUL_MALLINFO, 1,
[Define if you have mallinfo])))
LIBS="$save_LIBS"
MATH_LIBS=""
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
