From: ceriel <none@none>
Date: Tue, 22 Oct 1991 09:01:09 +0000 (+0000)
Subject: Do not define _end; causes name clashes
X-Git-Tag: release-5-5~706
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4d82a1b67e5958990f5e2a321e9502bcb987f259;p=ack.git

Do not define _end; causes name clashes
---

diff --git a/lang/occam/comp/code.c b/lang/occam/comp/code.c
index a3c5f81d2..66fa49ff5 100644
--- a/lang/occam/comp/code.c
+++ b/lang/occam/comp/code.c
@@ -501,7 +501,7 @@ void epilogue(proc) register struct symbol *proc;
 
 	curr_level--;
 	ret(0);
-	_end(-min_offset);
+	x_end(-min_offset);
 }
 
 void rep_init(v, e1, e2, r_info)
@@ -606,7 +606,7 @@ void trailer()
 	else {
 		loc(0);
 		ret(wz);
-		_end(-min_offset);
+		x_end(-min_offset);
 	}
 	closefile();
 }
diff --git a/lang/occam/comp/em.c b/lang/occam/comp/em.c
index ca6d5f84b..df4c9bde8 100644
--- a/lang/occam/comp/em.c
+++ b/lang/occam/comp/em.c
@@ -316,7 +316,7 @@ void cal(lab) char *lab;	{	C_cal(lab); }
 void cmi()			{	C_cmi((arith) vz); }
 void com()			{	C_com((arith) vz); }
 void del(offset) int offset;	{	C_del((arith) offset); }
-void _end(size) int size;	{	C_end((arith) size); }
+void x_end(size) int size;	{	C_end((arith) size); }
 void exp(lab) char *lab;	{	C_exp(lab); }
 void ior()			{	C_ior((arith) vz); }
 void lae(lab, offset) char *lab; int offset;
diff --git a/lang/occam/comp/em.h b/lang/occam/comp/em.h
index f6728e82e..7f08e75e1 100644
--- a/lang/occam/comp/em.h
+++ b/lang/occam/comp/em.h
@@ -19,7 +19,7 @@ void Txx(), xxi(), Stl(), Inl(), Del(), Loe();
 void cmi(), ngi(), and(), ior(), xor(), sli(), sri(), com(), lar(), lxl();
 void lxa(), lfr(), ste(), lae(), aar(), lal(), adp(), ldc0(), zeq(), zne();
 void zlt(), zgt(), blm(), sti(), cal(), asp(), loc(), lor0(), loi(), pro();
-void ret(), _end(), stl(), laedot(), del(), lol(), ldl(), meswp(), meserr();
+void ret(), x_end(), stl(), laedot(), del(), lol(), ldl(), meswp(), meserr();
 void init_rt(), exp(), rom(), blt(), magic(), lin(), tst(), fil(), trp();
 void main_fil(), init(), openfile(), closefile(), maxdes();