4.3.4 build fails on UnixWare 7

[River Tarnell <river@xxxxxxxxxxxxx>]

hello,

i am unable to build zsh 4.3.4 on UnixWare 7.1.3.  the following error occurs:

        cc -c -I.  -DHAVE_CONFIG_H -O  -o zle_refresh.o zle_refresh.c
UX:acomp: ERROR: "zle_refresh.c", line 182: integral constant expression 
expected
*** Error code 1 (bu21)
UX:make: ERROR: fatal error.

UnixWare defines MB_CUR_MAX as:

#define MB_CUR_MAX        ((int)__ctype[520])

i was able to fix this with the following diff:

*** zle_refresh.c.old   Wed Aug 22 05:25:37 2007
--- zle_refresh.c       Wed Aug 22 05:27:58 2007
***************
*** 179,187 ****
  zwcputc(ZLE_INT_T c)
  {
  #ifdef MULTIBYTE_SUPPORT
!     char mbtmp[MB_CUR_MAX + 1];
      mbstate_t mbstate;
      int i;

      if (c == WEOF)
        return;
--- 179,189 ----
  zwcputc(ZLE_INT_T c)
  {
  #ifdef MULTIBYTE_SUPPORT
!     char *mbtmp;
      mbstate_t mbstate;
      int i;
+
+     mbtmp = alloca(MB_CUR_MAX + 1);

      if (c == WEOF)
        return;

however, use of alloca seems suboptimal (perhaps malloc could be used 
instead).

	- river.

Attachment: pgpwgb1FA3VnE.pgp
Description: PGP signature