cmd/gc: fix windows build, probably

TBR=iant
CC=golang-dev
https://golang.org/cl/39540043

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index ae0a3bb2d571ef4d4ff3a6598cb4d0927ef1948d..6faf4c446c50a82b4de7ea06472a9b133a1faf59 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -1182,7 +1182,6 @@ char*     expstring(void);
 void   mkpackage(char* pkgname);
 void   unimportfile(void);
 int32  yylex(void);
-extern int     windows;
 extern int     yylast;
 extern int     yyprev;
 

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index f1df9cc3b61a0a5eb5c48f42f6bf657d9766185c..0ca332fac6752ad5cf4f33aac8e6b69bc6f62ac6 100644 (file)
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -14,7 +14,6 @@
 #define        ungetc  ccungetc
 
 extern int yychar;
-int windows;
 int yyprev;
 int yylast;
 
@@ -548,7 +547,7 @@ islocalname(Strlit *name)
 {
        if(name->len >= 1 && name->s[0] == '/')
                return 1;
-       if(windows && name->len >= 3 &&
+       if(ctxt->windows && name->len >= 3 &&
           yy_isalpha(name->s[0]) && name->s[1] == ':' && name->s[2] == '/')
                return 1;
        if(name->len >= 2 && strncmp(name->s, "./", 2) == 0)
@@ -2342,7 +2341,7 @@ mkpackage(char* pkgname)
 
        if(outfile == nil) {
                p = strrchr(infile, '/');
-               if(windows) {
+               if(ctxt->windows) {
                        q = strrchr(infile, '\\');
                        if(q > p)
                                p = q;