Merge branch 'master' into d2d

[apitrace] / compat.h

diff --git a/compat.h b/compat.h
index f1d302878e212a3deb2e0f3c73371732aaa8a87f..b74bfd47d69155ce092bc6e2566cd729b37e1ee3 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -48,10 +48,31 @@
 #define __field_ecount(x) /**/
 #define __field_ecount_full(x) /**/
 #define __inline static __inline__
+#define __deref_out /**/
+#define __deref_out_opt /**/
+#define __deref_out_bcount(x)
+#define __maybenull
+#define __in_z
+#define __in_z_opt
+#define __out_z
+#define __out_ecount_z(x)
+#define __nullterminated
+#define __notnull
 
+#ifndef DECLSPEC_DEPRECATED
 #define DECLSPEC_DEPRECATED /**/
+#endif
 
-#define UINT8 uint8_t
+#ifndef DECLSPEC_NOVTABLE
+#define DECLSPEC_NOVTABLE
+#endif
+
+#ifndef __MINGW64_VERSION_MAJOR
+#define INT8 signed char
+#define UINT8 unsigned char
+#define INT16 signed short
+#define UINT16 unsigned short
+#endif
 
 #endif /* __MINGW32__ */