diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-17 22:14:47 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-17 22:14:47 +0000 |
| commit | a93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (patch) | |
| tree | 4797f43c4e1694903d93da1b61ba972955cb6aad /src/GvimExt | |
| parent | b21e5843e53d3582df5f521f57e7e52e83d51d10 (diff) | |
updated for version 7.0e01v7.0e01
Diffstat (limited to 'src/GvimExt')
| -rw-r--r-- | src/GvimExt/gvimext.cpp | 6 | ||||
| -rw-r--r-- | src/GvimExt/gvimext.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index c204a0c573..dbd769abed 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -103,7 +103,7 @@ getRuntimeDir(char *buf) strcpy(buf, searchpath(buf)); // remove "gvim.exe" from the end - for (idx = strlen(buf) - 1; idx >= 0; idx--) + for (idx = (int)strlen(buf) - 1; idx >= 0; idx--) if (buf[idx] == '\\' || buf[idx] == '/') { buf[idx + 1] = 0; @@ -279,7 +279,7 @@ dyn_gettext_load(void) getRuntimeDir(szBuff); if (szBuff[0] != 0) { - len = strlen(szBuff); + len = (DWORD)strlen(szBuff); if (dyn_libintl_init(szBuff)) { strcpy(szBuff + len, "lang"); @@ -740,7 +740,7 @@ STDMETHODIMP CShellExt::PushToWindow(HWND hParent, return NOERROR; } -STDMETHODIMP CShellExt::GetCommandString(UINT idCmd, +STDMETHODIMP CShellExt::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT FAR *reserved, LPSTR pszName, diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h index d68807320a..c0e39cb173 100644 --- a/src/GvimExt/gvimext.h +++ b/src/GvimExt/gvimext.h @@ -43,6 +43,12 @@ #include <windowsx.h> #include <shlobj.h> +/* Accommodate old versions of VC that don't have a modern Platform SDK */ +#if _MSC_VER < 1300 +#undef UINT_PTR +#define UINT_PTR UINT +#endif + #define ResultFromShort(i) ResultFromScode(MAKE_SCODE(SEVERITY_SUCCESS, 0, (USHORT)(i))) // Initialize GUIDs (should be done only and at-least once per DLL/EXE) @@ -152,7 +158,7 @@ public: STDMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - STDMETHODIMP GetCommandString(UINT idCmd, + STDMETHODIMP GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT FAR *reserved, LPSTR pszName, |