XEmacs 21.5 Build Failure on Solaris 5.5.1

Latest 21.5 from CVS won't build here on my Solaris 5.5.1 system at work. Here's the failure generated by 'make beta' gcc -c -O2 -pipe -ffast-math -fno-exceptions -Demacs -I. -DHAVE_CONFIG_H -I/u/shelton2/software/SunOS-5.5/include -I/usr/dt/include -I/usr/openwin/include /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/cmds.c gcc -c -O2 -pipe -ffast-math -fno-exceptions -Demacs -I. -DHAVE_CONFIG_H -I/u/shelton2/software/SunOS-5.5/include -I/usr/dt/include -I/usr/openwin/include /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.c In file included from /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console-impl.h:28, from /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.c:33: /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.h:118: warning: `struct console_methods' declared inside parameter list /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.h:118: warning: its scope is only this definition or declaration, which is probably not what you want /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.c:521: conflicting types for `add_entry_to_console_type_list' /u/shelton2/software/src/xemacs-21.5-2002-06-21/src/console.h:118: previous declaration of `add_entry_to_console_type_list' make[1]: *** [console.o] Error 1 make[1]: Leaving directory `/u/shelton2/software/build/SunOS-5.5/xemacs-21.5-2002-06-21/src' make: *** [dump-elcs] Error 2 Here's my Installation file: uname -a: SunOS denver 5.5.1 Generic_105428-01 sun4u sparc SUNW,Ultra-5_10 Solaris ../../../src/xemacs-21.5-2002-06-21/configure '--prefix=/u/shelton2/software/SunOS-5.5/xemacs-21.5-2002-06-21' '--with-gcc' '--site-includes=/u/shelton2/software/SunOS-5.5/include' '--site-libraries=/u/shelton2/software/SunOS-5.5/lib' '--infopath=/u/shelton2/software/info' '--with-mule=no' '--compiler=gcc' '--cflags=-O2 -pipe -ffast-math -fno-exceptions' '--with-dialogs=no' '--with-widgets=no' '--package-path=/u/shelton2/software/site-packages::/u/shelton2/software/xemacs-packages' '--debug=no' '--error-checking=none' XEmacs 21.5-b6 "bok choi" configured for `sparc-sun-solaris2.5.1'. Compilation / Installation: Source code location: /u/shelton2/software/src/xemacs-21.5-2002-06-21 Installation prefix: /u/shelton2/software/SunOS-5.5/xemacs-21.5-2002-06-21 Additional header files: /u/shelton2/software/SunOS-5.5/include Additional libraries: /u/shelton2/software/SunOS-5.5/lib Runtime library search path: /u/shelton2/software/SunOS-5.5/lib:/usr/dt/lib:/usr/openwin/lib:/u/shelton2/software/SunOS-5.5/gcc-3.1/lib/gcc-lib/sparc-sun-solaris2.5.1/3.1/../../.. Operating system description file: `s/sol2.h' Machine description file: `m/sparc.h' Compiler: gcc -O2 -pipe -ffast-math -fno-exceptions Relocating allocator for buffers: yes GNU version of malloc: yes Window System: Compiling in support for the X window system: - X Windows headers location: /usr/dt/include /usr/openwin/include - X Windows libraries location: /usr/dt/lib /usr/openwin/lib - Handling WM_COMMAND properly. Using Lucid menubars. Using Lucid scrollbars. TTY: Images: Compiling in support for GIF images (builtin). Compiling in support for XPM images. Compiling in support for PNG images. Sound: Databases: Compiling in support for DBM. Internationalization: Mail: Compiling in support for "dot-locking" mail spool file locking method. Other Features: Inhibiting IPv6 canonicalization at startup. Compiling in support for ToolTalk. Compiling in support for dynamic shared object modules. - Vin