# HG changeset patch
# User anatofuz
# Date 1581765835 -32400
# Node ID 98a9b99df4dc616c2a824ec059af6fe147379c3a
# Parent  65c061fed881b231214f550a6a1272ba05075c71# Parent  8cdd4088bb1d11b43cf5f1f534c76ad0d1165f52
merged

diff -r 65c061fed881 -r 98a9b99df4dc src/gearsTools/update_implheader.pl
--- a/src/gearsTools/update_implheader.pl	Sat Feb 15 20:23:17 2020 +0900
+++ b/src/gearsTools/update_implheader.pl	Sat Feb 15 20:23:55 2020 +0900
@@ -96,7 +96,7 @@
   }
   close $fh;
   open $fh, '>', $header_file;
-  print $fh "typedef struct $impl <Impl, Isa> impl $interface {\n";
+  print $fh "typedef struct $impl <Type, Isa> impl $interface {\n";
   map { print $fh "    $_\n"}  @$write_codes;
   print $fh "    __code next(...);\n";
   print $fh "} $impl;\n";
diff -r 65c061fed881 -r 98a9b99df4dc src/impl/fs_impl.h
--- a/src/impl/fs_impl.h	Sat Feb 15 20:23:17 2020 +0900
+++ b/src/impl/fs_impl.h	Sat Feb 15 20:23:55 2020 +0900
@@ -1,4 +1,4 @@
-typedef struct fs_impl <Impl, Isa> impl fs {
+typedef struct fs_impl <Type, Isa> impl fs {
     __code allocinode(Type* fs_impl, uint dev, struct superblock* sb, __code next(...));
     __code allocinode_loop(Type* fs_impl, uint inum, uint dev, short type, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...));
     __code allocinode_loopcheck(Type* fs_impl, uint inum, uint dev, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...));