diff --git a/ChangeLog b/ChangeLog
index d1602fb9b..0c1983be7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-23  Adam Fedor  <fedor@gnu.org>
+
+	* Source/mframe.m (mframe_decode_return): Change return struct
+	to fixed size to avoid gcc bug.
+
 2005-06-23  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSObject.h:
diff --git a/Source/mframe.m b/Source/mframe.m
index 0bd01b49a..c729f42d8 100644
--- a/Source/mframe.m
+++ b/Source/mframe.m
@@ -1702,7 +1702,7 @@ mframe_decode_return (const char *type, void* buffer, void* retframe)
     case _C_UNION_B:
       {
 	typedef struct {
-	  char	val[size];
+	  char	val[4];
 	} block;
 	inline block retframe_block(void *rframe)
 	{