+ new improvements in ctpp2 integration

src/ctpp2/include/CTPP2VMOpcodes.h

@@ -85,7 +85,7 @@
 #define IDIV             0x03070000 // Integer division
 #define MOD              0x03080000 // Divide two numbers and returns only the remainder
 #define NEG              0x03090000 // Negate
-#define NOT              0x030A0000 // Logical negation
+#define CTPP2_NOT              0x030A0000 // Logical negation
 
 // String ops. ///////// 0x-3X----- ////////////////////////////////////////////////////////////////
 #define CONCAT           0x03100000 // Concatenate strings

src/ctpp2/src/CTPP2Compiler.cpp

@@ -1445,7 +1445,7 @@ INT_32 CTPP2Compiler::OpNot(const VMDebugInfo & oDebugInfo)
 {
 	COMPILER_REPORTER("OpNot");
 
-return oVMOpcodeCollector.Insert(CreateInstruction(NOT | ARG_SRC_STACK, 0, oDebugInfo.GetInfo()));
+return oVMOpcodeCollector.Insert(CreateInstruction(CTPP2_NOT | ARG_SRC_STACK, 0, oDebugInfo.GetInfo()));
 }
 
 //

src/ctpp2/src/CTPP2VM.cpp

@@ -1044,7 +1044,7 @@ HL_RST;
 								break;
 
 							// NOT, Logical negation
-							case SYSCALL_OPCODE_LO(NOT):
+							case SYSCALL_OPCODE_LO(CTPP2_NOT):
 								{
 									if (iSrcReg == ARG_SRC_STACK)
 									{