diff --git a/ChangeLog b/ChangeLog
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 576e7364e7..b83d399a9d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-02-08  Laszlo Peter  <laca@ireland.sun.com>
+
+	* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+	* gtk/gtktextview.c: ditto
+
 2002-02-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkspinbutton.h (struct _GtkSpinButtonClass): add
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index d340c71d2d..7b00005b90 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -52,8 +52,8 @@
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
 
-#define CHECK_IN_BUFFER(anchor) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", __FUNCTION__); } while (0)
-#define CHECK_IN_BUFFER_RETURN(anchor, val) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", __FUNCTION__); return (val); } while (0)
+#define CHECK_IN_BUFFER(anchor) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); } while (0)
+#define CHECK_IN_BUFFER_RETURN(anchor, val) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); return (val); } while (0)
 
 static GtkTextLineSegment *
 pixbuf_segment_cleanup_func (GtkTextLineSegment *seg,
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index c2ce50f14f..d8185cea1b 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6692,12 +6692,12 @@ gtk_text_view_get_window (GtkTextView *text_view,
       break;
 
     case GTK_TEXT_WINDOW_PRIVATE:
-      g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", __FUNCTION__);
+      g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_GNUC_FUNCTION);
       return NULL;
       break;
     }
 
-  g_warning ("%s: Unknown GtkTextWindowType", __FUNCTION__);
+  g_warning ("%s: Unknown GtkTextWindowType", G_GNUC_FUNCTION);
   return NULL;
 }