--- a/test/goto.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/goto.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,71 +1,71 @@
 
 
-code (*conv)(int,code (*)());
-code a2(int i,code conv());
-code a3(int i,code conv());
-code a4(int i,code conv());
-code a5(int i,code conv());
-code a6();
-code a7();
-code a8();
-code a9();
+__code (*conv)(int,__code (*)());
+__code a2(int i,__code conv());
+__code a3(int i,__code conv());
+__code a4(int i,__code conv());
+__code a5(int i,__code conv());
+__code a6();
+__code a7();
+__code a8();
+__code a9();
 
-char* print_conv(code conv());
+char* print_conv(__code conv());
 
-code (*exit0)(int);
+__code (*exit0)(int);
 void *env;
 
-code
-a2(int i,code conv())
+__code
+a2(int i,__code conv())
 {
     printf("#0020:a2 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a4);
 }
 
-code
-a3(int i,code (*conv)())
+__code
+a3(int i,__code (*conv)())
 {
     printf("#0027:a3 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a5);
 }
 
-code
-a4(int i,code conv())
+__code
+a4(int i,__code conv())
 {
     printf("#0034:a4 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,a6);
 }
 
-code
-a5(int i,code (*conv)())
+__code
+a5(int i,__code (*conv)())
 {
     printf("#0041:a5 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,i+2,i+3,a7);
 }
 
-code
-a6(int i,int j,int k,code conv())
+__code
+a6(int i,int j,int k,__code conv())
 {
     printf("#0048:a6 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a8);
 }
 
-code
-a7(int i,,int j,int k,code (*conv)())
+__code
+a7(int i,,int j,int k,__code (*conv)())
 {
     printf("#0055:a7 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a9);
 }
 
-code
-a8(int i,int j,int k,code conv())
+__code
+a8(int i,int j,int k,__code conv())
 {
     printf("#0062:a8 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,j,k,exit0);
 }
 
-code
-a9(int i,int j,int k,code (*conv)())
+__code
+a9(int i,int j,int k,__code (*conv)())
 {
     printf("#0069:a9 %d %s\n",i,print_conv(conv));
     goto (*conv)(0),env;
@@ -79,7 +79,7 @@
 }
 
 char*
-print_conv(code conv())
+print_conv(__code conv())
 {
     if(conv==a2) return "a2";
     if(conv==a3) return "a3";