Merge pull request #880 from aras-p/master

Fix for lumped/unity/batch builds
2017-05-10 11:11:44 -06:00
parent 02c4728a83 23d3c712bc
commit d9b08d5c3d
12 changed files with 25 additions and 1 deletions
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -35,7 +35,9 @@
 //

 // this only applies to the standalone wrapper, not the front end in general
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#endif

 #include "ResourceLimits.h"
 #include "Worklist.h"