Exempt GTK+ from the mem chunk deprecation, since we need GTK+ 2.8 to

2005-12-06 Matthias Clasen <mclasen@redhat.com> * glib/gmem.h: Exempt GTK+ from the mem chunk deprecation, since we need GTK+ 2.8 to compile against GLib 2.10.
dieterv · Dec 6, 2005 · d3388eb · d3388eb
1 parent b995c03
commit d3388eb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmem.h: Exempt GTK+ from the mem chunk deprecation, since
+	we need GTK+ 2.8 to compile against GLib 2.10.
+
 2005-12-05  Manish Singh  <yosh@gimp.org>
 
 	* tests/run-collate-test.sh: set LC_COLLATE, not LANG, to be sure

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmem.h: Exempt GTK+ from the mem chunk deprecation, since
+	we need GTK+ 2.8 to compile against GLib 2.10.
+
 2005-12-05  Manish Singh  <yosh@gimp.org>
 
 	* tests/run-collate-test.sh: set LC_COLLATE, not LANG, to be sure

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmem.h: Exempt GTK+ from the mem chunk deprecation, since
+	we need GTK+ 2.8 to compile against GLib 2.10.
+
 2005-12-05  Manish Singh  <yosh@gimp.org>
 
 	* tests/run-collate-test.sh: set LC_COLLATE, not LANG, to be sure

diff --git a/glib/gmem.h b/glib/gmem.h
@@ -99,7 +99,7 @@ void	g_mem_profile	(void);
 
 
 /* deprecated memchunks and allocators */
-#ifndef G_DISABLE_DEPRECATED
+#if !defined (G_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
 typedef struct _GAllocator GAllocator;
 typedef struct _GMemChunk  GMemChunk;
 #define g_mem_chunk_create(type, pre_alloc, alloc_type)	( \