diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-24 15:11:40 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-24 15:11:40 +0000 |
| commit | 281daf62aac8b40d1c6cccfb57535c5a1ac1f5db (patch) | |
| tree | 04170bca33f4e908b23bfbada77008d3180f0701 | |
| parent | 30848947930e16759289db7489f7a6a20897f6e1 (diff) | |
updated for version 7.2-323v7.2.323
| -rw-r--r-- | src/gui_w32.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 164e8c614e..5a43d826cd 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -212,12 +212,14 @@ typedef struct _DllVersionInfo DWORD dwPlatformID; } DLLVERSIONINFO; +#include <poppack.h> + typedef struct tagTOOLINFOA_NEW { UINT cbSize; UINT uFlags; HWND hwnd; - UINT uId; + UINT_PTR uId; RECT rect; HINSTANCE hinst; LPSTR lpszText; @@ -227,15 +229,13 @@ typedef struct tagTOOLINFOA_NEW typedef struct tagNMTTDISPINFO_NEW { NMHDR hdr; - LPTSTR lpszText; + LPSTR lpszText; char szText[80]; HINSTANCE hinst; UINT uFlags; LPARAM lParam; } NMTTDISPINFO_NEW; -#include <poppack.h> - typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *); #ifndef TTM_SETMAXTIPWIDTH # define TTM_SETMAXTIPWIDTH (WM_USER+24) diff --git a/src/version.c b/src/version.c index 9523db5e69..36ff3b6f5d 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 323, +/**/ 322, /**/ 321, |