aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-11-11 13:08:35 -0800
committerRuss Cox <rsc@golang.org>2009-11-11 13:08:35 -0800
commit8c3d2f015b181e8786f330a6fd6bb03379f2f395 (patch)
tree052fa5544801683818cc4950d5cf69a9488e31b9
parent8515a9f4e2eeafeec79104ec69a56d1ed861ab38 (diff)
downloadgo-8c3d2f015b181e8786f330a6fd6bb03379f2f395.tar.gz
go-8c3d2f015b181e8786f330a6fd6bb03379f2f395.zip
avoid clash with stdio's getc, ungetc.
Fixes #50. R=r https://golang.org/cl/154064
-rw-r--r--src/cmd/cc/cc.h3
-rw-r--r--src/cmd/gc/go.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/cmd/cc/cc.h b/src/cmd/cc/cc.h
index a1168fc8b5..a6f3384383 100644
--- a/src/cmd/cc/cc.h
+++ b/src/cmd/cc/cc.h
@@ -39,6 +39,9 @@
#define EXTERN extern
#endif
+#define getc ccgetc
+#define ungetc ccungetc
+
typedef struct Node Node;
typedef struct Sym Sym;
typedef struct Type Type;
diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index bb11f4c92b..ee863decbb 100644
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -13,6 +13,11 @@
#ifndef EXTERN
#define EXTERN extern
#endif
+
+
+#define getc gcgetc
+#define ungetc gcungetc
+
enum
{
NHUNK = 50000,