From 8ca102d42ed7b1c0ef687365ec32dca2ebd18faa Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Tue, 12 May 2020 23:18:48 +0200
Subject: cc: dont export gethunk(), hunk, nhunk and thunk

---
 sys/src/cmd/cc/compat   | 8 ++++----
 sys/src/cmd/cc/compat.h | 6 ------
 sys/src/cmd/cc/lex.c    | 1 -
 sys/src/cmd/cc/macbody  | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'sys/src/cmd/cc')

diff --git a/sys/src/cmd/cc/compat b/sys/src/cmd/cc/compat
index 7a9eafa0f..58f538304 100644
--- a/sys/src/cmd/cc/compat
+++ b/sys/src/cmd/cc/compat
@@ -78,11 +78,11 @@ myfork(void)
 
 extern char end[];
 
-char*	hunk = end;
-long	nhunk;
-uintptr	thunk;
+static char*	hunk = end;
+static long	nhunk;
+static uintptr	thunk;
 
-void
+static void
 gethunk(void)
 {
 	long nh;
diff --git a/sys/src/cmd/cc/compat.h b/sys/src/cmd/cc/compat.h
index d7f3112b5..8e6019843 100644
--- a/sys/src/cmd/cc/compat.h
+++ b/sys/src/cmd/cc/compat.h
@@ -24,11 +24,5 @@ EXTERN	int	mydup(int, int);
 EXTERN	int	myfork(void);
 EXTERN	int	mypipe(int*);
 
-EXTERN	void	gethunk(void);
-
-EXTERN	char*	hunk;
-EXTERN	long	nhunk;
-EXTERN	uintptr	thunk;
-
 EXTERN	void*	alloc(long n);
 EXTERN	void*	allocn(void *p, long on, long n);
diff --git a/sys/src/cmd/cc/lex.c b/sys/src/cmd/cc/lex.c
index 7c22cb464..15da69bee 100644
--- a/sys/src/cmd/cc/lex.c
+++ b/sys/src/cmd/cc/lex.c
@@ -1228,7 +1228,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 
 	types[TXXX] = T;
 	types[TCHAR] = typ(TCHAR, T);
diff --git a/sys/src/cmd/cc/macbody b/sys/src/cmd/cc/macbody
index efe119a4a..290660c22 100644
--- a/sys/src/cmd/cc/macbody
+++ b/sys/src/cmd/cc/macbody
@@ -246,7 +246,7 @@ macdef(void)
 	if(isspace(c))
 		if(c != '\n')
 			c = getnsc();
-	base = hunk;
+	base = alloc(1);
 	len = 1;
 	ischr = 0;
 	for(;;) {
-- 
cgit v1.2.3