From 6f08d4cf61aba2729dd719531db9d2b21327dd06 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Sep 2004 18:03:57 +0000 Subject: [PATCH] Check for mallinfo. 2004-09-21 Matthias Clasen * configure.in: Check for mallinfo. * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO is defined. (#153168, Darren Creutz) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 1 + tests/testtreemodel.c | 21 +++++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/ChangeLog b/ChangeLog index 88cf40aeac..948d7450fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-09-21 Matthias Clasen + * configure.in: Check for mallinfo. + + * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO + is defined. (#153168, Darren Creutz) + * gtk/gtkactiongroup.c: Fix typos in signal docs. (#153224, John Finlay) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 88cf40aeac..948d7450fe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-09-21 Matthias Clasen + * configure.in: Check for mallinfo. + + * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO + is defined. (#153168, Darren Creutz) + * gtk/gtkactiongroup.c: Fix typos in signal docs. (#153224, John Finlay) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 88cf40aeac..948d7450fe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-09-21 Matthias Clasen + * configure.in: Check for mallinfo. + + * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO + is defined. (#153168, Darren Creutz) + * gtk/gtkactiongroup.c: Fix typos in signal docs. (#153224, John Finlay) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 88cf40aeac..948d7450fe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-09-21 Matthias Clasen + * configure.in: Check for mallinfo. + + * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO + is defined. (#153168, Darren Creutz) + * gtk/gtkactiongroup.c: Fix typos in signal docs. (#153224, John Finlay) diff --git a/configure.in b/configure.in index 73766aec78..21ceb73ff4 100644 --- a/configure.in +++ b/configure.in @@ -571,6 +571,7 @@ AC_C_CONST AC_TYPE_SIGNAL AC_FUNC_MMAP +AC_CHECK_FUNCS(mallinfo) AC_CHECK_FUNCS(getresuid) AC_TYPE_UID_T diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c index fd01d70987..56b986b3f9 100644 --- a/tests/testtreemodel.c +++ b/tests/testtreemodel.c @@ -1,4 +1,25 @@ +/* testtreemodel.c + * Copyright (C) 2004 Red Hat, Inc., Matthias Clasen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_MALLINFO #include +#endif #include static gint repeats = 2;