yet another attempt to avoid conflicts with

<stdio.h>, which we weren't even #including

R=r
https://golang.org/cl/154108

diff --git a/src/cmd/5a/a.h b/src/cmd/5a/a.h
index 86dbac26b6afad3034b26f14d839787279684204..34591817f687a6af3ff5a73e086c8ede61ad32f1 100644 (file)
--- a/src/cmd/5a/a.h
+++ b/src/cmd/5a/a.h
@@ -37,10 +37,13 @@
 #define        EXTERN  extern
 #endif
 
-#define        getc    aagetc
-#define        ungetc  aaungetc
+#undef getc
+#undef ungetc
 #undef BUFSIZ
 
+#define        getc    ccgetc
+#define        ungetc  ccungetc
+
 typedef        struct  Sym     Sym;
 typedef        struct  Gen     Gen;
 typedef        struct  Io      Io;

diff --git a/src/cmd/5a/a.y b/src/cmd/5a/a.y
index a1de1ea5a451eb03f22218ae3b7bea897e00dc1e..bb30ac698a456cd78e1261b32a28d6fbe30bc583 100644 (file)
--- a/src/cmd/5a/a.y
+++ b/src/cmd/5a/a.y
@@ -29,6 +29,7 @@
 // THE SOFTWARE.
 
 %{
+#include <stdio.h>     /* if we don't, bison will, and a.h re-#defines getc */
 #include "a.h"
 %}
 %union

diff --git a/src/cmd/6a/a.h b/src/cmd/6a/a.h
index ce2ab292274470d8956473337a459c8637606c0a..11ace638999019b931da5dd26e2acecd8e325d37 100644 (file)
--- a/src/cmd/6a/a.h
+++ b/src/cmd/6a/a.h
@@ -38,10 +38,13 @@
 #define        EXTERN  extern
 #endif
 
-#define        getc    aagetc
-#define        ungetc  aaungetc
+#undef getc
+#undef ungetc
 #undef BUFSIZ
 
+#define        getc    ccgetc
+#define        ungetc  ccungetc
+
 typedef        struct  Sym     Sym;
 typedef        struct  Ref     Ref;
 typedef        struct  Gen     Gen;

diff --git a/src/cmd/6a/a.y b/src/cmd/6a/a.y
index a6d755d0439fa2d87bc505c522e144c5b0c59b3c..c48246072d045405914f54cedad4fcdb7c8c44de 100644 (file)
--- a/src/cmd/6a/a.y
+++ b/src/cmd/6a/a.y
@@ -29,6 +29,7 @@
 // THE SOFTWARE.
 
 %{
+#include <stdio.h>     /* if we don't, bison will, and a.h re-#defines getc */
 #include "a.h"
 %}
 %union {

diff --git a/src/cmd/8a/a.h b/src/cmd/8a/a.h
index 37b175c1891787d42c2cb353a8d354adc1cb6f6a..bf0fc77083aabbc0ae55ece19f33775824762f10 100644 (file)
--- a/src/cmd/8a/a.h
+++ b/src/cmd/8a/a.h
@@ -38,10 +38,13 @@
 #define        EXTERN  extern
 #endif
 
-#define        getc    aagetc
-#define        ungetc  aaungetc
+#undef getc
+#undef ungetc
 #undef BUFSIZ
 
+#define        getc    ccgetc
+#define        ungetc  ccungetc
+
 typedef        struct  Sym     Sym;
 typedef        struct  Ref     Ref;
 typedef        struct  Gen     Gen;

diff --git a/src/cmd/8a/a.y b/src/cmd/8a/a.y
index 3fded981f152eeda9b71bda43691b845a3944d9e..8bc96cce53080e8410f40fd096eda6e55b73b8a8 100644 (file)
--- a/src/cmd/8a/a.y
+++ b/src/cmd/8a/a.y
@@ -29,6 +29,7 @@
 // THE SOFTWARE.
 
 %{
+#include <stdio.h>     /* if we don't, bison will, and a.h re-#defines getc */
 #include "a.h"
 %}
 %union {

diff --git a/src/cmd/cc/cc.h b/src/cmd/cc/cc.h
index 696cdab5671229728b22ac3738e54924429270c6..93b5f8bf792fa409906d986246415030ff39769e 100644 (file)
--- a/src/cmd/cc/cc.h
+++ b/src/cmd/cc/cc.h
@@ -39,9 +39,12 @@
 #define EXTERN extern
 #endif
 
+#undef getc
+#undef ungetc
+#undef BUFSIZ
+
 #define        getc    ccgetc
 #define        ungetc  ccungetc
-#undef BUFSIZ
 
 typedef        struct  Node    Node;
 typedef        struct  Sym     Sym;

diff --git a/src/cmd/cc/cc.y b/src/cmd/cc/cc.y
index 0ade1d162cc18c073dcdeb24b169abe9e52b68a7..2a34ca14d7df92d5ad81b4e82ea5254a4c093372 100644 (file)
--- a/src/cmd/cc/cc.y
+++ b/src/cmd/cc/cc.y
@@ -29,6 +29,7 @@
 // THE SOFTWARE.
 
 %{
+#include <stdio.h>     /* if we don't, bison will, and cc.h re-#defines getc */
 #include "cc.h"
 %}
 %union {

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index 33f93b7d7720859132ad81b6dc0564369fbd30ac..cf7862e76da16a1ec7ce507f8151e41762c62d87 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -14,11 +14,13 @@
 #define        EXTERN  extern
 #endif
 
-
-#define        getc    gcgetc
-#define        ungetc  gcungetc
+#undef getc
+#undef ungetc
 #undef BUFSIZ
 
+#define        getc    ccgetc
+#define        ungetc  ccungetc
+
 enum
 {
        NHUNK           = 50000,

diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index 61ead2d3bb415651df6c7bb4ad428bfadebed0df..79c720a648e7489ab3a678be7fe7f17fa6a87854 100644 (file)
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -18,6 +18,7 @@
  */
 
 %{
+#include <stdio.h>     /* if we don't, bison will, and go.h re-#defines getc */
 #include "go.h"
 %}
 %union {