diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-03-16 13:54:13 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-03-16 13:54:13 +0000 |
commit | 0fde290e55feb8f3505c790c8ce9b5302893dfae (patch) | |
tree | f05b982aebd383f62e6d904a267bf9b9e3267cee /src/if_ole.cpp | |
parent | 9701da0169c39ff259f281abfed7f3b4c1dbfc27 (diff) | |
download | vim-git-0fde290e55feb8f3505c790c8ce9b5302893dfae.tar.gz |
updated for version 7.1-282v7.1.282
Diffstat (limited to 'src/if_ole.cpp')
-rw-r--r-- | src/if_ole.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/if_ole.cpp b/src/if_ole.cpp index fad2097e1..b2057f973 100644 --- a/src/if_ole.cpp +++ b/src/if_ole.cpp @@ -34,6 +34,12 @@ extern HWND s_hwnd; extern HWND vim_parent_hwnd; } +#if _MSC_VER < 1300 +/* Work around old versions of basetsd.h which wrongly declares + * UINT_PTR as unsigned long */ +# define UINT_PTR UINT +#endif + #include "if_ole.h" // Interface definitions #include "iid_ole.c" // UUID definitions (compile here) @@ -107,7 +113,7 @@ public: STDMETHOD(SendKeys)(BSTR keys); STDMETHOD(Eval)(BSTR expr, BSTR *result); STDMETHOD(SetForeground)(void); - STDMETHOD(GetHwnd)(UINT *result); + STDMETHOD(GetHwnd)(UINT_PTR *result); private: // Constructor is private - create using CVim::Create() @@ -288,9 +294,9 @@ CVim::Invoke( } STDMETHODIMP -CVim::GetHwnd(UINT *result) +CVim::GetHwnd(UINT_PTR *result) { - *result = (UINT) s_hwnd; + *result = (UINT_PTR)s_hwnd; return S_OK; } |