From fdb4a832136b9ef29c5c797555b542854aec9d04 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Sat, 14 May 2011 04:10:07 +0000
Subject: [PATCH] 29276: always typedef Heapid for use by auto-generated header
 files.

---
 ChangeLog | 7 ++++++-
 Src/zsh.h | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 715556c0e..f88377c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Bart Schaefer  <schaefer@zsh.org>
+
+	* 29276: Src/zsh.h: typedef Heapid unconditionally, to prevent
+	compile errors in automatically-generated header files.
+
 2011-05-14  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 29268: Src/Zle/compcore.c: dupstring() the value that's
@@ -14698,5 +14703,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5301 $
+* $Revision: 1.5302 $
 *****************************************************
diff --git a/Src/zsh.h b/Src/zsh.h
index f389a900e..62ab5ade3 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -2327,7 +2327,6 @@ enum {
  * 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 @@ enum {
  */
 typedef unsigned int Heapid;
 
+#ifdef ZSH_HEAP_DEBUG
+
 /* printf format specifier corresponding to Heapid */
 #define HEAPID_FMT	"%x"