From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 14 Mar 2005 05:06:17 +0000 (+0000)
Subject: Some fixes
X-Git-Tag: GLIB_2_7_0~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1c70360e57f1e00dc60adb884373773a90adc0f;p=platform%2Fupstream%2Fglib.git

Some fixes
---

diff --git a/ChangeLog b/ChangeLog
index 05170ed..50f04e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 005-03-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gatomic.c:
+	* glib/gcache.c: Small fixes to the previous commit.
+
+005-03-13  Matthias Clasen  <mclasen@redhat.com>
+
 	Make PLT-reduction work with gcc4, and don't include
 	everything in galias.h:
 	
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 05170ed..50f04e0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 005-03-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gatomic.c:
+	* glib/gcache.c: Small fixes to the previous commit.
+
+005-03-13  Matthias Clasen  <mclasen@redhat.com>
+
 	Make PLT-reduction work with gcc4, and don't include
 	everything in galias.h:
 	
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 05170ed..50f04e0 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 005-03-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gatomic.c:
+	* glib/gcache.c: Small fixes to the previous commit.
+
+005-03-13  Matthias Clasen  <mclasen@redhat.com>
+
 	Make PLT-reduction work with gcc4, and don't include
 	everything in galias.h:
 	
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 05170ed..50f04e0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 005-03-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gatomic.c:
+	* glib/gcache.c: Small fixes to the previous commit.
+
+005-03-13  Matthias Clasen  <mclasen@redhat.com>
+
 	Make PLT-reduction work with gcc4, and don't include
 	everything in galias.h:
 	
diff --git a/glib/gatomic.c b/glib/gatomic.c
index 06d7ee6..308486b 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 f92276b..e3080c9 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"