diff --git a/ChangeLog b/ChangeLog
index 7b8d9b158..e53046569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-03  Laszlo Peter  <laca@ireland.sun.com>
+
+	* src/frames.c: add a dummy element to the enum so
+          the signals array is not empty. (breaks the build with Forte C)
+
+	* src/window.c: s/__FUNCTION__/G_GNUC_FUNCTION/
+
 2001-11-27  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (constrain_position): change so that window can be
diff --git a/src/frames.c b/src/frames.c
index 15b3e42c5..cc4804543 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -148,6 +148,7 @@ static void clear_tip (MetaFrames *frames);
 
 enum
 {
+  dummy, /* remove this when you add more signals */
   LAST_SIGNAL
 };
 
diff --git a/src/window.c b/src/window.c
index 0c47f96d7..aa17a8c86 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4081,7 +4081,7 @@ read_rgb_icon (MetaWindow    *window,
   
   if (sizeof (gulong) != 4)
     meta_warning ("%s: Whoops, I think this function may be broken on 64-bit\n",
-                  __FUNCTION__);
+                  G_GNUC_FUNCTION);
   
   meta_error_trap_push (window->display);
   type = None;