Fix warnings, merge, and check my code in

[satune.git] / src / AST / ops.h

diff --git a/src/AST/ops.h b/src/AST/ops.h
index 63da885..b330d1b 100644 (file)
--- a/src/AST/ops.h
+++ b/src/AST/ops.h
@@ -1,6 +1,6 @@
 #ifndef OPS_H
 #define OPS_H
 #ifndef OPS_H
 #define OPS_H

-enum LogicOp {AND, OR, NOT, XOR, IMPLIES};
+enum LogicOp {L_AND, L_OR, L_NOT, L_XOR, L_IMPLIES};

 typedef enum LogicOp LogicOp;
 
 enum ArithOp {ADD, SUB};
 typedef enum LogicOp LogicOp;
 
 enum ArithOp {ADD, SUB};