wiiyourself: pass a more restrictive warning set

2 files changed, 4 insertions, 8 deletions

diff --git a/tracker-wii/wiiyourself/warns-begin.hpp b/tracker-wii/wiiyourself/warns-begin.hpp
index dab250f7..0d0365a9 100644
--- a/tracker-wii/wiiyourself/warns-begin.hpp
+++ b/tracker-wii/wiiyourself/warns-begin.hpp
@@ -17,4 +17,8 @@
 #   pragma clang diagnostic ignored "-Wextra-semi"
 #   pragma clang diagnostic ignored "-Wshadow-field"
 #   pragma clang diagnostic ignored "-Wreserved-id-macro"
+#   pragma clang diagnostic ignored "-Wconversion"
+#   pragma clang diagnostic ignored "-Wfloat-equal"
+#   pragma clang diagnostic ignored "-Wunused-macros"
+#   pragma clang diagnostic ignored "-Wcast-qual"
 #endif
diff --git a/tracker-wii/wiiyourself/wiimote.cpp b/tracker-wii/wiiyourself/wiimote.cpp
index 90788495..503a0783 100644
--- a/tracker-wii/wiiyourself/wiimote.cpp
+++ b/tracker-wii/wiiyourself/wiimote.cpp
@@ -2369,11 +2369,7 @@ bool wiimote::Load16bitMonoSampleWAV(const TCHAR* filepath, wiimote_sample &out)
 	TRACE(_T("Loading '%s'"), filepath);
 
 	FILE *file;
-#if (_MSC_VER >= 1400) // VC 2005+
 	_tfopen_s(&file, filepath, _T("rb"));
-#else
-	file = _tfopen(filepath, _T("rb"));
-#endif
 	_ASSERT(file);
 	if (!file) {
 		WARN(_T("Couldn't open '%s"), filepath);
@@ -2562,11 +2558,7 @@ bool wiimote::Load16BitMonoSampleRAW(const TCHAR*   filepath,
 	// load them
 	FILE *file;
 	bool res;
-#if (_MSC_VER >= 1400) // VC 2005+
 	_tfopen_s(&file, filepath, _T("rb"));
-#else
-	file = _tfopen(filepath, _T("rb"));
-#endif
 	_ASSERT(file);
 	if (!file) {
 		TRACE(_T("Couldn't open '%s"), filepath);