about summary refs log tree commit diff
path: root/Src/init.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-02-09 13:58:11 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-02-09 13:58:11 +0000
commit9fe0077305b9f92a10f6a2f29d7fa1331a551509 (patch)
tree68fd3470abba0ef650134aa62a447954c2a13265 /Src/init.c
parent4a0ddedf0af0bbd22530132df830b588b2b63220 (diff)
downloadzsh-9fe0077305b9f92a10f6a2f29d7fa1331a551509.tar.gz
zsh-9fe0077305b9f92a10f6a2f29d7fa1331a551509.tar.xz
zsh-9fe0077305b9f92a10f6a2f29d7fa1331a551509.zip
Geoff: 27693: rename underscore to avoid name clash
Diffstat (limited to 'Src/init.c')
-rw-r--r--Src/init.c6
1 files changed, 3 insertions, 3 deletions
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;