diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-12-06 14:16:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-12-06 14:16:27 +0000 |
| commit | d3388eb4e8e0ae28985c59e88aa676665e651953 (patch) | |
| tree | 7250da167096239701a72c976fb867a6f027839a | |
| parent | b995c03ea22c1e0c029c2c77d5fa2eb17d26a36c (diff) | |
| download | glib-d3388eb4e8e0ae28985c59e88aa676665e651953.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 5 | ||||
| -rw-r--r-- | glib/gmem.h | 2 |
4 files changed, 16 insertions, 1 deletions
@@ -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 index 9cac68471..dd69b6596 100644 --- 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 index 9cac68471..dd69b6596 100644 --- 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 index c64c3b4a7..ec1fb6919 100644 --- 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) ( \ |