yet another attempt to avoid conflicts with

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

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

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;

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

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;

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	{

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;

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	{

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;

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	{

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,

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	{