Make room for twitcher guard if enabled ok hiser@ ip:peasoup

Former-commit-id: 96da97f420d7940ceaa4c7d7c6fa9c27edb79b35

tools/transforms/Makefile

@@ -18,7 +18,7 @@
 PROGS=p1transform.exe nulltransform.exe integertransformdriver.exe
 
 CC=g++
-CFLAGS= -g -Wall
+CFLAGS= -g -Wall $(TWITCHER_FLAGS)
 INCLUDE=-I. -I../../include -I../../xform -I../../beaengine/include -I../../libIRDB/include/ -I../../libMEDSannotation/include/ -I../../libtransform/include/
 LIBS=-L../../lib -lxform -lIRDB-core -lIRDB-cfg -lBeaEngine_s_d -lpqxx  -lMEDSannotation -ltransform
 

tools/transforms/PNStackLayout.cpp

@@ -234,6 +234,11 @@ void PNStackLayout::AddCanaryPadding()
 
 	unsigned int size = 8;
 
+// Twitcher adds another guard
+#ifdef TWITCHER_GUARD
+        size += 8;
+#endif
+
 	sort(mem_objects.begin(),mem_objects.end(),CompareRangeDisplacedOffset);
 	//counts the additional padding added, does not take into consideration previous padding
 	unsigned int total_padding =0;