From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29615 invoked from network); 22 Oct 2008 17:25:10 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 22 Oct 2008 17:25:10 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 55258 invoked from network); 22 Oct 2008 17:24:26 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 22 Oct 2008 17:24:26 -0000 Received: (qmail 16641 invoked by alias); 22 Oct 2008 17:23:31 -0000 Mailing-List: contact zsh-users-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 13375 Received: (qmail 16615 invoked from network); 22 Oct 2008 17:23:28 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 22 Oct 2008 17:23:28 -0000 Received: from cluster-g.mailcontrol.com (cluster-g.mailcontrol.com [208.87.233.190]) by bifrost.dotsrc.org (Postfix) with ESMTPS id D8B1580524C0 for ; Wed, 22 Oct 2008 19:23:19 +0200 (CEST) Received: from cameurexb01.EUROPE.ROOT.PRI ([193.128.72.68]) by rly13g.srv.mailcontrol.com (MailControl) with ESMTP id m9MHNDiZ026265 for ; Wed, 22 Oct 2008 18:23:13 +0100 Received: from news01.csr.com ([10.103.143.38]) by cameurexb01.EUROPE.ROOT.PRI with Microsoft SMTPSVC(6.0.3790.3959); Wed, 22 Oct 2008 18:23:12 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.14.2/8.13.4) with ESMTP id m9MHN7iA009196 for ; Wed, 22 Oct 2008 18:23:07 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.14.2/8.14.2/Submit) with ESMTP id m9MHN774009192 for ; Wed, 22 Oct 2008 18:23:07 +0100 Message-Id: <200810221723.m9MHN774009192@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: Zsh users list Subject: Re: 4.3.6-dev-2 available In-reply-to: <20081022163859.GQ29756@lorien.comfychair.org> References: <15318.1224579280@csr.com> <20081022163859.GQ29756@lorien.comfychair.org> Comments: In-reply-to Danek Duvall message dated "Wed, 22 Oct 2008 09:38:59 -0700." Date: Wed, 22 Oct 2008 18:23:07 +0100 From: Peter Stephenson X-OriginalArrivalTime: 22 Oct 2008 17:23:12.0957 (UTC) FILETIME=[DCA246D0:01C9346A] X-Scanned-By: MailControl A-08-50-15 (www.mailcontrol.com) on 10.71.0.123 X-Virus-Scanned: ClamAV 0.92.1/8470/Wed Oct 22 17:13:42 2008 on bifrost X-Virus-Status: Clean 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 Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070