Declaration of items[] made static to avoid name conflict with ra_items.c

Core allocation macros added.

diff --git a/util/ego/ra/ra.c b/util/ego/ra/ra.c
index eb74eaa..999a65e 100644 (file)
--- a/util/ego/ra/ra.c
+++ b/util/ego/ra/ra.c
@@ -23,8 +23,13 @@
 #include "ra_xform.h"
 
 
+#define newrabx()      (bext_p)        newstruct(bext_ra)
+#define newralpx()     (lpext_p)       newstruct(lpext_ra)
+#define oldrabx(x)     oldstruct(bext_ra,x)
+#define oldralpx(x)    oldstruct(lpext_ra,x)
+
 short alloc_id;
-item_p items[NRITEMTYPES];
+static item_p items[NRITEMTYPES];
 int nrinstrs;
 line_p *instrmap;