rename EXID define to EX_ID because of a conflict with EXID in bison's y.tab.h

diff --git a/cmd/gvpr/mkdefs.c b/cmd/gvpr/mkdefs.c
index bcadd29824d7624e1bd2afbedcbf6f7df3a5de66..492f684068da300385fa654237bd74a1a53a357c 100644 (file)
--- a/cmd/gvpr/mkdefs.c
+++ b/cmd/gvpr/mkdefs.c
@@ -177,10 +177,10 @@ int main(int argc, char *argv[])
 
     fprintf(fp, "static Exid_t symbols[] = {\n");
     for (recp = vals.next; recp; recp = recp->next) {
-       fprintf(fp, "\tEXID ( %s, %s, %s, %s, 0),\n",
+       fprintf(fp, "\tEX_ID ( %s, %s, %s, %s, 0),\n",
                recp->name, recp->lex, recp->symbol, recp->type);
     }
-    fprintf(fp, "\tEXID ( {0}, 0, 0, 0, 0)\n};\n");
+    fprintf(fp, "\tEX_ID ( {0}, 0, 0, 0, 0)\n};\n");
 
     fprintf(fp, "\nstatic char* typenames[] = {\n");
     for (recp = vals.next; recp; recp = recp->next) {

diff --git a/lib/expr/exdata.c b/lib/expr/exdata.c
index 37eed1118ecde9b4af7a94de58c9ac6fa610d9b1..18982558a778c4c9892a8ca1bad83b7fceaff584 100644 (file)
--- a/lib/expr/exdata.c
+++ b/lib/expr/exdata.c
@@ -32,39 +32,39 @@ Exid_t exbuiltin[] = {
 
     /* id_string references the first entry */
 
-    EXID("string", DECLARE, STRING, STRING, 0),
+    EX_ID("string", DECLARE, STRING, STRING, 0),
 
     /* order not important after this point (but sorted anyway) */
 
-    EXID("break", BREAK, BREAK, 0, 0),
-    EXID("case", CASE, CASE, 0, 0),
-    EXID("char", DECLARE, CHAR, CHAR, 0),
-    EXID("continue", CONTINUE, CONTINUE, 0, 0),
-    EXID("default", DEFAULT, DEFAULT, 0, 0),
-    EXID("double", DECLARE, FLOATING, FLOATING, 0),
-    EXID("else", ELSE, ELSE, 0, 0),
-    EXID("exit", EXIT, EXIT, INTEGER, 0),
-    EXID("for", FOR, FOR, 0, 0),
-    EXID("float", DECLARE, FLOATING, FLOATING, 0),
-    EXID("gsub", GSUB, GSUB, STRING, 0),
-    EXID("if", IF, IF, 0, 0),
-    EXID("int", DECLARE, INTEGER, INTEGER, 0),
-    EXID("long", DECLARE, INTEGER, INTEGER, 0),
-    EXID("print", PRINT, PRINT, INTEGER, 0),
-    EXID("printf", PRINTF, PRINTF, INTEGER, 0),
-    EXID("query", QUERY, QUERY, INTEGER, 0),
-    EXID("rand", RAND, RAND, FLOATING, 0),
-    EXID("return", RETURN, RETURN, 0, 0),
-    EXID("scanf", SCANF, SCANF, INTEGER, 0),
-    EXID("sscanf", SSCANF, SSCANF, INTEGER, 0),
-    EXID("sprintf", SPRINTF, SPRINTF, STRING, 0),
-    EXID("srand", SRAND, SRAND, INTEGER, 0),
-    EXID("sub", SUB, SUB, STRING, 0),
-    EXID("substr", SUBSTR, SUBSTR, STRING, 0),
-    EXID("switch", SWITCH, SWITCH, 0, 0),
-    EXID("unsigned", DECLARE, UNSIGNED, UNSIGNED, 0),
-    EXID("void", DECLARE, VOID, 0, 0),
-    EXID("while", WHILE, WHILE, 0, 0),
-    EXID({0}, 0, 0, 0, 0)
+    EX_ID("break", BREAK, BREAK, 0, 0),
+    EX_ID("case", CASE, CASE, 0, 0),
+    EX_ID("char", DECLARE, CHAR, CHAR, 0),
+    EX_ID("continue", CONTINUE, CONTINUE, 0, 0),
+    EX_ID("default", DEFAULT, DEFAULT, 0, 0),
+    EX_ID("double", DECLARE, FLOATING, FLOATING, 0),
+    EX_ID("else", ELSE, ELSE, 0, 0),
+    EX_ID("exit", EXIT, EXIT, INTEGER, 0),
+    EX_ID("for", FOR, FOR, 0, 0),
+    EX_ID("float", DECLARE, FLOATING, FLOATING, 0),
+    EX_ID("gsub", GSUB, GSUB, STRING, 0),
+    EX_ID("if", IF, IF, 0, 0),
+    EX_ID("int", DECLARE, INTEGER, INTEGER, 0),
+    EX_ID("long", DECLARE, INTEGER, INTEGER, 0),
+    EX_ID("print", PRINT, PRINT, INTEGER, 0),
+    EX_ID("printf", PRINTF, PRINTF, INTEGER, 0),
+    EX_ID("query", QUERY, QUERY, INTEGER, 0),
+    EX_ID("rand", RAND, RAND, FLOATING, 0),
+    EX_ID("return", RETURN, RETURN, 0, 0),
+    EX_ID("scanf", SCANF, SCANF, INTEGER, 0),
+    EX_ID("sscanf", SSCANF, SSCANF, INTEGER, 0),
+    EX_ID("sprintf", SPRINTF, SPRINTF, STRING, 0),
+    EX_ID("srand", SRAND, SRAND, INTEGER, 0),
+    EX_ID("sub", SUB, SUB, STRING, 0),
+    EX_ID("substr", SUBSTR, SUBSTR, STRING, 0),
+    EX_ID("switch", SWITCH, SWITCH, 0, 0),
+    EX_ID("unsigned", DECLARE, UNSIGNED, UNSIGNED, 0),
+    EX_ID("void", DECLARE, VOID, 0, 0),
+    EX_ID("while", WHILE, WHILE, 0, 0),
+    EX_ID({0}, 0, 0, 0, 0)
 
 };