From 7bb5dd4982882479e08acf94b1afa37bea0d7070 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Thu, 5 May 2016 10:23:44 -0500
Subject: [PATCH] move TARGET and STK to sqvm.cpp instead of SQ to reduce
 probability of collisions in case inner headers are included

---
 squirrel/sqvm.cpp | 2 ++
 squirrel/sqvm.h   | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/squirrel/sqvm.cpp b/squirrel/sqvm.cpp
index 1dc8c3e..087daf0 100644
--- a/squirrel/sqvm.cpp
+++ b/squirrel/sqvm.cpp
@@ -15,6 +15,8 @@
 #include "sqclass.h"
 
 #define TOP() (_stack._vals[_top-1])
+#define TARGET _stack._vals[_stackbase+arg0]
+#define STK(a) _stack._vals[_stackbase+(a)]
 
 bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
diff --git a/squirrel/sqvm.h b/squirrel/sqvm.h
index 2138fb3..35fef5b 100644
--- a/squirrel/sqvm.h
+++ b/squirrel/sqvm.h
@@ -28,9 +28,6 @@ struct SQExceptionTrap{
 
 #define _INLINE
 
-#define STK(a) _stack._vals[_stackbase+(a)]
-#define TARGET _stack._vals[_stackbase+arg0]
-
 typedef sqvector<SQExceptionTrap> ExceptionsTraps;
 
 struct SQVM : public CHAINABLE_OBJ