Merge branch 'master' into cooking

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index 44f6491725c17a5dc458cdf789a0e2b8cf248450..3f4949de21319bbfc03dea8c011ed3992a3d1b8f 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -22,6 +22,8 @@
  */
 #ifndef GMQCC_LEXER_HDR
 #define GMQCC_LEXER_HDR
+#include "gmqcc.h"
+
 typedef struct token_s token;
 
 struct token_s {
@@ -185,8 +187,7 @@ static const oper_info c_operators[] = {
     { "++",  1, opid3('+','+','P'), ASSOC_RIGHT, 16, OP_PREFIX, false},
     { "--",  1, opid3('-','-','P'), ASSOC_RIGHT, 16, OP_PREFIX, false},
 
-    { "**",  2, opid2('*','*'),     ASSOC_RIGHT, 15, 0,         true},
-
+    { "**",  2, opid2('*','*'),     ASSOC_RIGHT, 14, 0,         true},
     { "!",   1, opid2('!','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "~",   1, opid2('~','P'),     ASSOC_RIGHT, 14, OP_PREFIX, true},
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX, false},