Jacek Caban : axcore.idl: Guard GetTimeFormat by WINE_NO_UNICODE_MACROS ifdef and added missing AM_GBF_NODDSURFACELOCK define .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c9178fdf6fe4d7c77422a786ce825a554424b5f5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c9178fdf6fe4d7c77422a786ce...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Apr 16 13:55:00 2012 +0200

axcore.idl: Guard GetTimeFormat by WINE_NO_UNICODE_MACROS ifdef and added missing AM_GBF_NODDSURFACELOCK define.

---

 include/axcore.idl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/axcore.idl b/include/axcore.idl
index 66746d5..b8c0e69 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,