From f1c70360e57f1e00dc60adb884373773a90adc0f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Mar 2005 05:06:17 +0000 Subject: [PATCH] Some fixes --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gatomic.c | 4 ++-- glib/gcache.c | 4 ++-- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05170ede..50f04e04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +005-03-13 Matthias Clasen + + * glib/gatomic.c: + * glib/gcache.c: Small fixes to the previous commit. + 005-03-13 Matthias Clasen Make PLT-reduction work with gcc4, and don't include diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 05170ede..50f04e04 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +005-03-13 Matthias Clasen + + * glib/gatomic.c: + * glib/gcache.c: Small fixes to the previous commit. + 005-03-13 Matthias Clasen Make PLT-reduction work with gcc4, and don't include diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 05170ede..50f04e04 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +005-03-13 Matthias Clasen + + * glib/gatomic.c: + * glib/gcache.c: Small fixes to the previous commit. + 005-03-13 Matthias Clasen Make PLT-reduction work with gcc4, and don't include diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 05170ede..50f04e04 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +005-03-13 Matthias Clasen + + * glib/gatomic.c: + * glib/gcache.c: Small fixes to the previous commit. + 005-03-13 Matthias Clasen Make PLT-reduction work with gcc4, and don't include diff --git a/glib/gatomic.c b/glib/gatomic.c index 06d7ee6e..308486b7 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -22,9 +22,9 @@ #include "config.h" -#include "galias.h" #include "glib.h" #include "gthreadinit.h" +#include "galias.h" #if defined (__GNUC__) # if defined (G_ATOMIC_I486) @@ -647,5 +647,5 @@ _g_atomic_thread_init (void) #endif /* DEFINE_WITH_MUTEXES */ } -#define IN_FILE_gatomic 1 +#define __G_ATOMIC_C__ #include "galiasdef.c" diff --git a/glib/gcache.c b/glib/gcache.c index f92276b7..e3080c98 100644 --- a/glib/gcache.c +++ b/glib/gcache.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" typedef struct _GCacheNode GCacheNode; @@ -214,5 +214,5 @@ g_cache_node_destroy (GCacheNode *node) G_UNLOCK (node_mem_chunk); } -#define IN_FILE_gcache 1 +#define __G_CACHE_C__ #include "galiasdef.c" -- 2.34.1