From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10605 invoked by alias); 14 May 2011 16:22:35 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 29282 Received: (qmail 22544 invoked from network); 14 May 2011 16:22:31 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received-SPF: pass (ns1.primenet.com.au: SPF record at ntlworld.com designates 81.103.221.47 as permitted sender) Date: Sat, 14 May 2011 17:22:18 +0100 From: Peter Stephenson To: zsh workers Subject: Re: build problem with patch level 1.5301 Message-ID: <20110514172218.026dd8b5@pws-pc.ntlworld.com> In-Reply-To: <110513210002.ZM17090@torch.brasslantern.com> References: <110513210002.ZM17090@torch.brasslantern.com> X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=R50lirqlHffDPPkwUlkuVa99MrvKdVWo//yz83qex8g= c=1 sm=0 a=RdWrTPYP6dYA:10 a=uObrxnre4hsA:10 a=kj9zAlcOel0A:10 a=q2GGsy2AAAAA:8 a=NLZqzBF-AAAA:8 a=WVnwBuw2ITGvnr2cspsA:9 a=OizInRDNB1hpfLNbec4A:7 a=CjuIK1q_8ugA:10 a=I6wTmPyJxzYA:10 a=_dQi-Dcv4p4A:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 On Fri, 13 May 2011 21:00:00 -0700 Bart Schaefer wrote: > All that's really necessary, though, is to make the typedef for > "Heapid" visible regardless of whether ZSH_HEAP_DEBUG is defined. No problem with that, but it's probably a bit safer also to hide the prototypes of things we don't need to see. Index: Src/mem.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/mem.c,v retrieving revision 1.19 diff -p -u -r1.19 mem.c --- Src/mem.c 14 May 2011 00:07:42 -0000 1.19 +++ Src/mem.c 14 May 2011 16:20:45 -0000 @@ -123,6 +123,7 @@ static Heap heaps; static Heap fheap; +/**/ #ifdef ZSH_HEAP_DEBUG /* * The heap ID we'll allocate next. @@ -172,6 +173,8 @@ new_heap_id(void) { return next_heap_id++; } + +/**/ #endif /* Use new heaps from now on. This returns the old heap-list. */ @@ -723,6 +726,7 @@ hrealloc(char *p, size_t old, size_t new } } +/**/ #ifdef ZSH_HEAP_DEBUG /* * Check if heap_id is the identifier of a currently valid heap, @@ -768,6 +772,7 @@ memory_validate(Heapid heap_id) return 1; } +/**/ #endif /* allocate memory from the current memory pool and clear it */ -- Peter Stephenson Web page now at http://homepage.ntlworld.com/p.w.stephenson/