From 8e9a79a4b7ce9d2edf57663b6c477bd5dba8fb9d Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 24 Feb 2006 16:19:55 +0000 Subject: [PATCH] applied patch #1434174 - GCC 4.2 patches git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4533 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/StartMenu/StartMenu.c | 2 +- SCons/Tools/crossmingw.py | 5 +++++ Source/7zip/LZMADecode.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c index 233319d1..ca61264e 100644 --- a/Contrib/StartMenu/StartMenu.c +++ b/Contrib/StartMenu/StartMenu.c @@ -24,7 +24,7 @@ int rtl = 0; void *lpWndProcOld; BOOL CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ParentWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +static BOOL CALLBACK ParentWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); void AddFolderFromReg(int nFolder); void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py index 74dc3f86..6d4f2591 100644 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -45,6 +45,11 @@ import SCons.Util # This is what we search for to find mingw: prefixes = SCons.Util.Split(""" mingw32- + mingw32msvc- + i386-mingw32- + i486-mingw32- + i586-mingw32- + i686-mingw32- i386-mingw32msvc- i486-mingw32msvc- i586-mingw32msvc- diff --git a/Source/7zip/LZMADecode.c b/Source/7zip/LZMADecode.c index 28507610..2594c163 100644 --- a/Source/7zip/LZMADecode.c +++ b/Source/7zip/LZMADecode.c @@ -145,7 +145,7 @@ int LZMACALL lzmaDecode(lzma_stream *s) #define last2 _s.last2 #define last3 _s.last3 -#define p ((CProb *) _s.dynamicData) +#define p (*(CProb **) &_s.dynamicData) #define dynamicDataSize _s.dynamicDataSize #define state _s.state @@ -184,7 +184,7 @@ int LZMACALL lzmaDecode(lzma_stream *s) #define result _s.temp2 #define numLevels _s.temp3 #define posSlot _s.temp2 -#define newDictionarySize ((UInt32) _s.temp3) +#define newDictionarySize (*(UInt32*) &_s.temp3) #define matchByte _s.matchByte #define mi _s.mi