Re: 4.3.6-dev-2 available

[Peter Stephenson <pws@xxxxxxx>]

Danek Duvall wrote:
> This fails to compile on Solaris 11 with the Sun Studio 11 compiler, with
> the following error:
> 
>     "zle_refresh.c", line 1796: operands have incompatible types:
>              const struct  {long chr, int atr} ":" struct  {long chr, int atr
> }
>     cc: acomp failed for zle_refresh.c

Easy to fix.

Index: Src/Zle/zle_refresh.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_refresh.c,v
retrieving revision 1.71
diff -u -r1.71 zle_refresh.c
--- Src/Zle/zle_refresh.c	22 Jul 2008 19:54:29 -0000	1.71
+++ Src/Zle/zle_refresh.c	22 Oct 2008 17:21:46 -0000
@@ -1793,7 +1793,10 @@
 	    ZR_memcpy(p1, nl, nllen);
 	ZR_memset(p1 + nllen, zr_sp, winw - nllen);
 	p1[winw] = zr_zr;
-	p1[winw + 1] = (nllen < winw) ? zr_zr : nl[winw + 1];
+	if (nllen < winw)
+	    p1[winw + 1] = zr_zr;
+	else
+	    p1[winw + 1] = nl[winw + 1];
 	if (ln && nbuf[ln])
 	    ZR_memcpy(nl, p1, winw + 2);	/* next time obuf will be up-to-date */
 	else

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070