From 95231270ede1c8f915528cea08a2192ff45811cb Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Thu, 11 Mar 2004 14:25:12 +0000
Subject: 19595: rename DO to DOLOOP to avoid conflict with curses.h on Tru64
 5.1

---
 ChangeLog            | 6 ++++++
 Src/Zle/zle_tricky.c | 2 +-
 Src/hashtable.c      | 2 +-
 Src/lex.c            | 2 +-
 Src/parse.c          | 6 +++---
 Src/zsh.h            | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c95caa86e..bbdc0e6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-11  Oliver Kiddle  <opk@zsh.org>
+
+	* 19595: Src/hashtable.c, Src/lex.c, Src/parse.c, Src/zsh.h,
+	Src/Zle/zle_tricky.c: rename DO to DOLOOP to avoid conflict with
+	a DO in curses.h on Tru64 5.1
+
 2004-03-10  Peter Stephenson  <pws@csr.com>
 
 	* 19575: Src/signals.c, Test/C03traps.ztst: Fix the problem
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 57a61adcf..6f77810cc 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1105,7 +1105,7 @@ get_comp_string(void)
 	/* We reached the end. */
 	if (tok == ENDINPUT)
 	    break;
-	if ((ins && (tok == DO || tok == SEPER)) ||
+	if ((ins && (tok == DOLOOP || tok == SEPER)) ||
 	    (ins == 2 && i == 2) || (ins == 3 && i == 3) ||
 	    tok == BAR    || tok == AMPER     ||
 	    tok == BARAMP || tok == AMPERBANG ||
diff --git a/Src/hashtable.c b/Src/hashtable.c
index 7057c9a7e..b09936fa8 100644
--- a/Src/hashtable.c
+++ b/Src/hashtable.c
@@ -925,7 +925,7 @@ static struct reswd reswds[] = {
     {NULL, "}", 0, OUTBRACE},
     {NULL, "case", 0, CASE},
     {NULL, "coproc", 0, COPROC},
-    {NULL, "do", 0, DO},
+    {NULL, "do", 0, DOLOOP},
     {NULL, "done", 0, DONE},
     {NULL, "elif", 0, ELIF},
     {NULL, "else", 0, ELSE},
diff --git a/Src/lex.c b/Src/lex.c
index a852de369..952daf14d 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -393,7 +393,7 @@ ctxtlex(void)
     case BAR:
     case BARAMP:
     case INOUTPAR:
-    case DO:
+    case DOLOOP:
     case THEN:
     case ELIF:
     case ELSE:
diff --git a/Src/parse.c b/Src/parse.c
index b1c1d1594..9dd9a18eb 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -978,7 +978,7 @@ par_for(int *complex)
     incmdpos = 1;
     while (tok == SEPER)
 	yylex();
-    if (tok == DO) {
+    if (tok == DOLOOP) {
 	yylex();
 	par_save_list(complex);
 	if (tok != DONE)
@@ -1260,7 +1260,7 @@ par_while(int *complex)
     incmdpos = 1;
     while (tok == SEPER)
 	yylex();
-    if (tok == DO) {
+    if (tok == DOLOOP) {
 	yylex();
 	par_save_list(complex);
 	if (tok != DONE)
@@ -1304,7 +1304,7 @@ par_repeat(int *complex)
     yylex();
     while (tok == SEPER)
 	yylex();
-    if (tok == DO) {
+    if (tok == DOLOOP) {
 	yylex();
 	par_save_list(complex);
 	if (tok != DONE)
diff --git a/Src/zsh.h b/Src/zsh.h
index aab4737f9..a0b95bf42 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -209,7 +209,7 @@ enum {
     OUTBRACE,   /* }         */
     CASE,	/* case      */
     COPROC,	/* coproc    */
-    DO,		/* do        */
+    DOLOOP,	/* do        */
     DONE,	/* done      */ /* 45 */
     ELIF,	/* elif      */
     ELSE,	/* else      */
-- 
cgit 1.4.1