mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
.Ole: added #define to cover up clashing Font declarations
git-svn-id: svn://ultimatepp.org/upp/trunk@3260 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
138fd5bfd1
commit
81a23f0fc8
1 changed files with 2 additions and 0 deletions
|
|
@ -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 <comip.h>
|
||||
#undef Ptr
|
||||
#undef StdFont
|
||||
#undef Font
|
||||
#undef Picture
|
||||
#undef byte
|
||||
#undef CY
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue