Merge branch 'jc/denoise-rm-to-resolve'

diff --git a/compat/msvc.h b/compat/msvc.h
index 04b4750b87bdbe63a4a00781f45a2806a37c4a49..1d7a8c614565a6088f92f7c06d79210476ce505e 100644 (file)
--- a/compat/msvc.h
+++ b/compat/msvc.h
@@ -6,6 +6,10 @@
 #include <malloc.h>
 #include <io.h>
 
+#pragma warning(disable: 4018) /* signed/unsigned comparison */
+#pragma warning(disable: 4244) /* type conversion, possible loss of data */
+#pragma warning(disable: 4090) /* 'function' : different 'const' qualifiers (ALLOC_GROW etc.)*/
+
 /* porting function */
 #define inline __inline
 #define __inline__ __inline
@@ -18,7 +22,11 @@
 
 #undef ERROR
 
+#define ftello _ftelli64
+
 typedef int sigset_t;
+/* open for reading, writing, or both (not in fcntl.h) */
+#define O_ACCMODE     (_O_RDONLY | _O_WRONLY | _O_RDWR)
 
 #include "compat/mingw.h"