From 7d5800d718f9cbd701c942e3f87d146b28fd63dc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Dec 2005 15:54:44 +0000 Subject: [PATCH] Deprecate mem chunks --- ChangeLog | 2 ++ ChangeLog.pre-2-10 | 2 ++ ChangeLog.pre-2-12 | 2 ++ docs/reference/ChangeLog | 3 +++ glib/gmem.h | 2 +- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2aee8786a..c0255c129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-12-05 Matthias Clasen + * glib/gmem.h: Really deprecate GMemChunk. + * glib/gdate.c: * glib/gutils.c: * glib/gtree.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2aee8786a..c0255c129 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2005-12-05 Matthias Clasen + * glib/gmem.h: Really deprecate GMemChunk. + * glib/gdate.c: * glib/gutils.c: * glib/gtree.c: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2aee8786a..c0255c129 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,7 @@ 2005-12-05 Matthias Clasen + * glib/gmem.h: Really deprecate GMemChunk. + * glib/gdate.c: * glib/gutils.c: * glib/gtree.c: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 6c8c6cd39..acdd65177 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,8 @@ 2005-12-05 Matthias Clasen + * glib/tmpl/memory_slices.sgml: Fix a small formatting + problem. + * glib/tmpl/trees-nary.sgml: * glib/tmpl/linked_lists_single.sgml: * glib/tmpl/linked_lists_double.sgml: diff --git a/glib/gmem.h b/glib/gmem.h index 3187aaa4b..c64c3b4a7 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -99,7 +99,7 @@ void g_mem_profile (void); /* deprecated memchunks and allocators */ -#if !defined G_DISABLE_DEPRECATED || 1 +#ifndef G_DISABLE_DEPRECATED typedef struct _GAllocator GAllocator; typedef struct _GMemChunk GMemChunk; #define g_mem_chunk_create(type, pre_alloc, alloc_type) ( \