updated for version 7.2-323

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 164e8c614e9e3a65ec4915278070974b3b295c04..5a43d826cdbb2e4baff38cb2223aea1bd188c58e 100644 (file)
--- 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 9523db5e69f6d3374e4ffabe679cf85a07c534df..36ff3b6f5d4e6b8263b23b42d844e7f9565a561e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    323,
 /**/
     322,
 /**/