From 81a23f0fc8bdcc03047272d4b139bfe7a23c1cf0 Mon Sep 17 00:00:00 2001 From: rylek Date: Fri, 4 Mar 2011 08:12:50 +0000 Subject: [PATCH] .Ole: added #define to cover up clashing Font declarations git-svn-id: svn://ultimatepp.org/upp/trunk@3260 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Ole/Ole.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uppsrc/Ole/Ole.h b/uppsrc/Ole/Ole.h index d73956bb9..6a2d23008 100644 --- a/uppsrc/Ole/Ole.h +++ b/uppsrc/Ole/Ole.h @@ -7,6 +7,7 @@ #define Ptr Ptr_ #define StdFont StdFont_ +#define Font Font_ #define Picture Picture_ #define byte win32_byte_ // RpcNdr defines byte -> class with Upp::byte #define CY win32_CY_ @@ -14,6 +15,7 @@ #include #undef Ptr #undef StdFont +#undef Font #undef Picture #undef byte #undef CY