emacs-unicode-2 branch failed to build with macterm.c

[CHENG Gao]

I found this problem since June. I delayed my reporting since I wished
there were chances that an update from cvs source would solve this.

I did a "cvs up" minutes ago, and building failed as previous tries.
Error messages are as below:

,----
| gcc -c -fpascal-strings -DMAC_OSX   -Demacs -DHAVE_CONFIG_H   -I. 
-I/Users/shgog/repo-cvs/emacs/src -fpascal-strings -DMAC_OSX -Dtemacs  -g -O2 
-Wno-pointer-sign  macterm.c
| macterm.c: In function 'mac_set_unicode_keystroke_event':
| macterm.c:10366: error: 'CHARSET_8_BIT_CONTROL' undeclared (first use in this 
function)
| macterm.c:10366: error: (Each undeclared identifier is reported only once
| macterm.c:10366: error: for each function it appears in.)
| macterm.c:10368: error: 'charset_latin_iso8859_1' undeclared (first use in 
this function)
| macterm.c:10375: error: 'charset_mule_unicode_0100_24ff' undeclared (first 
use in this function)
| macterm.c:10378: error: 'charset_mule_unicode_2500_33ff' undeclared (first 
use in this function)
| macterm.c:10381: error: 'charset_mule_unicode_e000_ffff' undeclared (first 
use in this function)
| make[2]: *** [macterm.o] Error 1
| make[1]: *** [bootstrap-build] Error 2
| make: *** [bootstrap] Error 2
`----