Restore includes for suppressing warnings on vs2017

Commit d888b10931 remove those headers which have the side effect of
suppressing some warnings on Windows using vs2017. Keep those headers
around for till vs2019+.

Add additional suppressions where needed for spidermonkey headers.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>

source/gui/CGUISetting.h

@@ -21,7 +21,15 @@
 #include "lib/code_annotation.h"
 #include "ps/CStr.h"
 
+#if MSC_VERSION
+# pragma warning(push, 1)
+# pragma warning(disable: 4068)
+# pragma warning(disable: 4100)
+#endif
 #include <js/TypeDecls.h>
+#if MSC_VERSION
+# pragma warning(pop)
+#endif
 #include <utility>
 
 class IGUIObject;

source/gui/ObjectBases/IGUIObject.cpp

@@ -31,6 +31,7 @@
 #include "ps/Profiler2.h"
 #include "scriptinterface/Object.h"
 #include "scriptinterface/ScriptExceptions.h"
+#include "scriptinterface/ScriptExtraHeaders.h"
 #include "scriptinterface/ScriptRequest.h"
 #include "soundmanager/ISoundManager.h"
 

source/gui/ObjectBases/IGUIObject.h

@@ -33,6 +33,7 @@
 #include "lib/input.h"
 #include "maths/Rect.h"
 #include "ps/CStr.h"
+#include "scriptinterface/ScriptTypes.h"
 
 #include <js/RootingAPI.h>
 #include <js/TypeDecls.h>

source/ps/XMB/XMBStorage.h

@@ -21,7 +21,15 @@
 #include "lib/types.h"
 
 #include <cstddef>
+#if MSC_VERSION
+# pragma warning(push, 1)
+# pragma warning(disable: 4068)
+# pragma warning(disable: 4100)
+#endif
 #include <js/TypeDecls.h>
+#if MSC_VERSION
+# pragma warning(pop)
+#endif
 #include <libxml/parser.h>
 #include <memory>
 #include <string>