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

fix error: #pragma GCC diagnostic not allowed inside functions

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6500 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2014-06-22 02:27:18 +00:00
parent 45e80b52d5
commit 15fb0bd987
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Contrib/System/Source/System.c
View file

@ -444,6 +444,11 @@ __int64 GetIntFromString(TCHAR **p)
return myatoi64(buffer); return myatoi64(buffer);
} }
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized" // temp3 is set to 0 when we start parsing a new parameter
// must be outside of function for mingw
#endif
SystemProc *PrepareProc(BOOL NeedForCall) SystemProc *PrepareProc(BOOL NeedForCall)
{ {
int SectionType = PST_PROC, // First section is always proc spec int SectionType = PST_PROC, // First section is always proc spec
@ -683,14 +688,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
case _T('0'): case _T('1'): case _T('2'): case _T('3'): case _T('4'): case _T('0'): case _T('1'): case _T('2'): case _T('3'): case _T('4'):
case _T('5'): case _T('6'): case _T('7'): case _T('8'): case _T('9'): case _T('5'): case _T('6'): case _T('7'): case _T('8'): case _T('9'):
// Numeric inline // Numeric inline
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized" // temp3 is set to 0 when we start parsing a new parameter
#endif
if (temp3 == 0) if (temp3 == 0)
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
{ {
ib--; ib--;
// It's stupid, I know, but I'm too lazy to do another thing // It's stupid, I know, but I'm too lazy to do another thing
@ -759,14 +757,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
if (temp3 == 1) if (temp3 == 1)
proc->Params[ParamIndex].Output = BUGBUG64(int) temp4; proc->Params[ParamIndex].Output = BUGBUG64(int) temp4;
// Next parameter is output or something else // Next parameter is output or something else
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif
temp3++; temp3++;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
} }
ChangesDone = PCD_DONE; ChangesDone = PCD_DONE;
@ -914,6 +905,9 @@ SystemProc *PrepareProc(BOOL NeedForCall)
return proc; return proc;
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
void ParamAllocate(SystemProc *proc) void ParamAllocate(SystemProc *proc)
{ {