emacs-unicode-2 branch "make bootstrap" failure under MacOSX

[CHENG Gao <chenggao@gmail.com>]

I reported this failure about two months ago and got no reply. So I have
been waiting for this problem to be solved automagically. Since the
problem remains, I think I need report it once again.

I usually build from emacs-unicode-2 branch cvs source once a week. My
last successful build is on May 29. Since then "make bootstrap" fails
and reports error message as:

,----
| 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:10385: error: 'CHARSET_8_BIT_CONTROL' undeclared (first use in this function)
| macterm.c:10385: error: (Each undeclared identifier is reported only once
| macterm.c:10385: error: for each function it appears in.)
| macterm.c:10387: error: 'charset_latin_iso8859_1' undeclared (first use in this function)
| macterm.c:10394: error: 'charset_mule_unicode_0100_24ff' undeclared (first use in this function)
| macterm.c:10397: error: 'charset_mule_unicode_2500_33ff' undeclared (first use in this function)
| macterm.c:10400: 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
`----

And this should have nothing to do with merge of multi-tty branch for I
encountered  this since beginning of June.

Please look into this. 

TIA,

CHENG Gao