Commit 9a53fb57 authored by Russ Cox's avatar Russ Cox

cmd/gc: fix windows build, probably

TBR=iant
CC=golang-dev
https://golang.org/cl/39540043
parent 1eac128d
...@@ -1182,7 +1182,6 @@ char* expstring(void); ...@@ -1182,7 +1182,6 @@ char* expstring(void);
void mkpackage(char* pkgname); void mkpackage(char* pkgname);
void unimportfile(void); void unimportfile(void);
int32 yylex(void); int32 yylex(void);
extern int windows;
extern int yylast; extern int yylast;
extern int yyprev; extern int yyprev;
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#define ungetc ccungetc #define ungetc ccungetc
extern int yychar; extern int yychar;
int windows;
int yyprev; int yyprev;
int yylast; int yylast;
...@@ -548,7 +547,7 @@ islocalname(Strlit *name) ...@@ -548,7 +547,7 @@ islocalname(Strlit *name)
{ {
if(name->len >= 1 && name->s[0] == '/') if(name->len >= 1 && name->s[0] == '/')
return 1; return 1;
if(windows && name->len >= 3 && if(ctxt->windows && name->len >= 3 &&
yy_isalpha(name->s[0]) && name->s[1] == ':' && name->s[2] == '/') yy_isalpha(name->s[0]) && name->s[1] == ':' && name->s[2] == '/')
return 1; return 1;
if(name->len >= 2 && strncmp(name->s, "./", 2) == 0) if(name->len >= 2 && strncmp(name->s, "./", 2) == 0)
...@@ -2342,7 +2341,7 @@ mkpackage(char* pkgname) ...@@ -2342,7 +2341,7 @@ mkpackage(char* pkgname)
if(outfile == nil) { if(outfile == nil) {
p = strrchr(infile, '/'); p = strrchr(infile, '/');
if(windows) { if(ctxt->windows) {
q = strrchr(infile, '\\'); q = strrchr(infile, '\\');
if(q > p) if(q > p)
p = q; p = q;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment