Deprecate mem chunks

diff --git a/ChangeLog b/ChangeLog
index 2aee878..c0255c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2aee878..c0255c1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2aee878..c0255c1 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,7 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 6c8c6cd..acdd651 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 3187aaa..c64c3b4 100644 (file)
--- 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)        ( \