--- gcc-3.4.1/gcc/varray.h.orig	2004-01-30 19:55:33.000000000 +0900
+++ gcc-3.4.1/gcc/varray.h	2010-05-13 23:07:10.979452138 +0900
@@ -50,7 +50,7 @@
      pseudos that contain pointers into the replacement area allocated for
      this inline instance.  These pseudos are then marked as being equivalent
      to the appropriate address and substituted if valid.  */
-  rtx rtx;
+  rtx_def *rtx;
 
   /* Record the valid age for each entry.  The entry is invalid if its
      age is less than const_age.  */
@@ -110,11 +110,11 @@
 				tag ("VARRAY_DATA_GENERIC")))	generic[1];
   char			 *GTY ((length ("%0.num_elements"),
 				tag ("VARRAY_DATA_CPTR")))	cptr[1];
-  rtx			  GTY ((length ("%0.num_elements"),
+  rtx_def		 *GTY ((length ("%0.num_elements"),
 				tag ("VARRAY_DATA_RTX")))	rtx[1];
-  rtvec			  GTY ((length ("%0.num_elements"),
+  rtvec_def		 *GTY ((length ("%0.num_elements"),
 				tag ("VARRAY_DATA_RTVEC")))	rtvec[1];
-  tree			  GTY ((length ("%0.num_elements"),
+  tree_node		 *GTY ((length ("%0.num_elements"),
 				tag ("VARRAY_DATA_TREE")))	tree[1];
   struct bitmap_head_def *GTY ((length ("%0.num_elements"),
 				tag ("VARRAY_DATA_BITMAP")))	bitmap[1];