Merge branch 'master' into d2d

[apitrace] / compat.h

diff --git a/compat.h b/compat.h
index e98f746b30b65042a54c123bd38757627fd56196..b74bfd47d69155ce092bc6e2566cd729b37e1ee3 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -20,8 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- * Copyright 2007-2009 VMware, Inc.
- * All rights reserved.
  *
  **************************************************************************/
 
@@ -30,6 +28,7 @@
  */
 
 #ifdef __MINGW32__
+
 #define __in /**/
 #define __out /**/
 #define __inout /**/
@@ -49,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__ */
+