From 9fe0077305b9f92a10f6a2f29d7fa1331a551509 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Tue, 9 Feb 2010 13:58:11 +0000
Subject: Geoff: 27693: rename underscore to avoid name clash

---
 Src/init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Src/init.c')

diff --git a/Src/init.c b/Src/init.c
index 02129ddbb..aa0dffd6f 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -42,7 +42,7 @@ int noexitct = 0;
 /* buffer for $_ and its length */
 
 /**/
-char *underscore;
+char *zunderscore;
 
 /**/
 int underscorelen, underscoreused;
@@ -818,9 +818,9 @@ setupvals(void)
     ifs         = ztrdup(DEFAULT_IFS);
     wordchars   = ztrdup(DEFAULT_WORDCHARS);
     postedit    = ztrdup("");
-    underscore  = (char *) zalloc(underscorelen = 32);
+    zunderscore  = (char *) zalloc(underscorelen = 32);
     underscoreused = 1;
-    *underscore = '\0';
+    *zunderscore = '\0';
 
     zoptarg = ztrdup("");
     zoptind = 1;
-- 
cgit 1.4.1