dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

applied patch #1434174 - GCC 4.2 patches

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4533 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-02-24 16:19:55 +00:00
parent 9ec765a72b
commit 8e9a79a4b7
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/StartMenu/StartMenu.c
View file

@ -24,7 +24,7 @@ int rtl = 0;
void *lpWndProcOld; void *lpWndProcOld;
BOOL CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); 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 AddFolderFromReg(int nFolder);
void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)

5
SCons/Tools/crossmingw.py
View file

@ -45,6 +45,11 @@ import SCons.Util
# This is what we search for to find mingw: # This is what we search for to find mingw:
prefixes = SCons.Util.Split(""" prefixes = SCons.Util.Split("""
mingw32- mingw32-
mingw32msvc-
i386-mingw32-
i486-mingw32-
i586-mingw32-
i686-mingw32-
i386-mingw32msvc- i386-mingw32msvc-
i486-mingw32msvc- i486-mingw32msvc-
i586-mingw32msvc- i586-mingw32msvc-

4
Source/7zip/LZMADecode.c
View file

@ -145,7 +145,7 @@ int LZMACALL lzmaDecode(lzma_stream *s)
#define last2 _s.last2 #define last2 _s.last2
#define last3 _s.last3 #define last3 _s.last3
#define p ((CProb *) _s.dynamicData) #define p (*(CProb **) &_s.dynamicData)
#define dynamicDataSize _s.dynamicDataSize #define dynamicDataSize _s.dynamicDataSize
#define state _s.state #define state _s.state
@ -184,7 +184,7 @@ int LZMACALL lzmaDecode(lzma_stream *s)
#define result _s.temp2 #define result _s.temp2
#define numLevels _s.temp3 #define numLevels _s.temp3
#define posSlot _s.temp2 #define posSlot _s.temp2
#define newDictionarySize ((UInt32) _s.temp3) #define newDictionarySize (*(UInt32*) &_s.temp3)
#define matchByte _s.matchByte #define matchByte _s.matchByte
#define mi _s.mi #define mi _s.mi