emacs-unicode build - make bootstrap fails

[Cheng Gao]

Latest CVS checkout. MinGW build.

C:\Home\cvs\emacs-unicode\nt>make bootstrap

got

,----
| w32fns.c: In function `x_to_w32_font':
| w32fns.c:5409: error: structure has no member named `type'
| w32fns.c:5409: error: `coding_type_iso2022' undeclared (first use in this 
functi
| on)
| w32fns.c:5409: error: (Each undeclared identifier is reported only once
| w32fns.c:5409: error: for each function it appears in.)
| w32fns.c:5410: error: structure has no member named `flags'
| w32fns.c:5410: error: `CODING_FLAG_ISO_SAFE' undeclared (first use in this 
funct
| ion)
| make[2]: *** [oo-spd/i386/w32fns.o] Error 1
| make[2]: Leaving directory `C:/Home/cvs/emacs-unicode/src'
| make[1]: *** [bootstrap-temacs] Error 2
| make[1]: Leaving directory `C:/Home/cvs/emacs-unicode/src'
| make: *** [bootstrap-gmake] Error 2
`----

Tools I use:
,----
| C:\Home\cvs\emacs-unicode\nt>gcc -v
| Reading specs from c:/mingw/bin/../lib/gcc/mingw32/3.4.1/specs
| Configured with: ../gcc/configure --with-gcc --with-gnu-ld --with-gnu-as 
--host=
| mingw32 --target=mingw32 --prefix=/mingw --enable-threads --disable-nls 
--enable
| -languages=c,c++,f77,ada,objc,java --disable-win32-registry --disable-shared 
--e
| nable-sjlj-exceptions --enable-libgcj --disable-java-awt --without-x 
--enable-ja
| va-gc=boehm --disable-libgcj-debug --enable-interpreter 
--enable-hash-synchroniz
| ation --enable-libstdcxx-debug
| Thread model: win32
| gcc version 3.4.1 (mingw special)
|
| C:\Home\cvs\emacs-unicode\nt>make -v
| GNU Make 3.80
`----

Please help me. I can build emacs trunk successfully. I am eager to try unicode 
branch.

TIA!

-- 
花开花谢春不管，拂意事休对人言
水暖水寒鱼自知，会心处还期独赏