From c9178fdf6fe4d7c77422a786ce825a554424b5f5 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 16 Apr 2012 13:55:00 +0200
Subject: [PATCH] axcore.idl: Guard GetTimeFormat by WINE_NO_UNICODE_MACROS
 ifdef and added missing AM_GBF_NODDSURFACELOCK define.

---
 include/axcore.idl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/axcore.idl b/include/axcore.idl
index 66746d53949..b8c0e696aa6 100644
--- a/include/axcore.idl
+++ b/include/axcore.idl
@@ -21,7 +21,9 @@ cpp_quote("#define CHARS_IN_GUID 39")
 
 /* GetTimeFormat is defined in winnls.h as
  * either the W or A suffixed version */
+cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
 cpp_quote("#undef GetTimeFormat")
+cpp_quote("#endif")
 
 typedef struct _AMMediaType
 {
@@ -472,6 +474,7 @@ cpp_quote("#define AM_GBF_PREVFRAMESKIPPED 1")
 cpp_quote("#define AM_GBF_NOTASYNCPOINT 2")
 
 cpp_quote("#define AM_GBF_NOWAIT 4")
+cpp_quote("#define AM_GBF_NODDSURFACELOCK 8")
 
 [
 object,