diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2011-05-14 04:10:07 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2011-05-14 04:10:07 +0000 |
| commit | fdb4a832136b9ef29c5c797555b542854aec9d04 (patch) | |
| tree | 8db2ddc8866896a482f4e0e073d52a158223adf3 | |
| parent | f61ae85acfef8deefd7a5f2be3b36f6f79384a9d (diff) | |
| download | zsh-fdb4a832136b9ef29c5c797555b542854aec9d04.tar.gz zsh-fdb4a832136b9ef29c5c797555b542854aec9d04.tar.xz zsh-fdb4a832136b9ef29c5c797555b542854aec9d04.zip | |
29276: always typedef Heapid for use by auto-generated header files.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | 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" |