From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-29276-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 10123 invoked by alias); 14 May 2011 04:00:24 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 29276
Received: (qmail 9272 invoked from network); 14 May 2011 04:00:22 -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: none (ns1.primenet.com.au: domain at closedmail.com does not designate permitted sender hosts)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-id: <110513210002.ZM17090@torch.brasslantern.com>
Date: Fri, 13 May 2011 21:00:00 -0700
In-reply-to: <alpine.LN8.2.00.1105131951470.16506@ckhb06>
Comments: In reply to "S. Cowles" <scowles@ckhb.org>
 "build problem with patch level 1.5301" (May 13,  8:13pm)
References: <BANLkTinV2euaa_w+F7m7U0KMZm1ajYDMUg@mail.gmail.com>
	<alpine.LN8.2.00.1105131951470.16506@ckhb06>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: "S. Cowles" <scowles@ckhb.org>, zsh workers <zsh-workers@zsh.org>
Subject: Re: build problem with patch level 1.5301
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii

On May 13,  8:13pm, S. Cowles wrote:
}
} gcc -c -I. -I../Src -I../Src -I../Src/Zle -I.  -DHAVE_CONFIG_H -Wall -Wmissing-prototypes -O2  -o builtin.o builtin.c
} In file included from zsh.mdh:49:0,
}                   from builtin.c:33:
} mem.epro:5:35: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'last_heap_id'

Hmm, the script that generates zsh.mdh doesn't know about #ifdef,
so it tries to export a variable that's declared conditionally in
mem.c.

All that's really necessary, though, is to make the typedef for
"Heapid" visible regardless of whether ZSH_HEAP_DEBUG is defined.

Index: Src/zsh.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.h,v
retrieving revision 1.175
diff -u -r1.175 zsh.h
--- Src/zsh.h   14 May 2011 00:07:42 -0000      1.175
+++ Src/zsh.h   14 May 2011 03:59:32 -0000
@@ -2327,7 +2327,6 @@
  * Memory management *
  *********************/
 
-#ifdef ZSH_HEAP_DEBUG
 /*
  * A Heapid is a type for identifying, uniquely up to the point where
  * the count of new identifiers wraps. all heaps that are or
@@ -2341,6 +2340,8 @@
  */
 typedef unsigned int Heapid;
 
+#ifdef ZSH_HEAP_DEBUG
+
 /* printf format specifier corresponding to Heapid */
 #define HEAPID_FMT     "%x"
 

--