zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: clang 32-bit compile (I hear it still doesn't run though). 

- Applied edward's patch to remove boolean increment.
This commit is contained in:
Braden Obrzut 2013-08-27 20:28:38 -04:00
parent 7b5084df44
commit 5079d6c505
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/m_fixed.h
View File

@ -12,7 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "doomtype.h" #include "doomtype.h"
#if defined(__GNUC__) && defined(__i386__) #if defined(__GNUC__) && defined(__i386__) && !defined(__clang__)
#include "gccinlines.h" #include "gccinlines.h"
#elif defined(_MSC_VER) && defined(_M_IX86) #elif defined(_MSC_VER) && defined(_M_IX86)
#include "mscinlines.h" #include "mscinlines.h"

10
src/thingdef/thingdef_parse.cpp
View File

@ -867,7 +867,7 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
OPTIONAL = 1 OPTIONAL = 1
}; };
bool error = false; unsigned int error = 0;
const AFuncDesc *afd; const AFuncDesc *afd;
FName funcname; FName funcname;
FString args; FString args;
@ -876,8 +876,8 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
if (sc.LumpNum == -1 || Wads.GetLumpFile(sc.LumpNum) > 0) if (sc.LumpNum == -1 || Wads.GetLumpFile(sc.LumpNum) > 0)
{ {
sc.ScriptMessage ("action functions can only be imported by internal class and actor definitions!"); sc.ScriptMessage ("Action functions can only be imported by internal class and actor definitions!");
error++; ++error;
} }
sc.MustGetToken(TK_Native); sc.MustGetToken(TK_Native);
@ -887,7 +887,7 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
if (afd == NULL) if (afd == NULL)
{ {
sc.ScriptMessage ("The function '%s' has not been exported from the executable.", sc.String); sc.ScriptMessage ("The function '%s' has not been exported from the executable.", sc.String);
error++; ++error;
} }
sc.MustGetToken('('); sc.MustGetToken('(');
if (!sc.CheckToken(')')) if (!sc.CheckToken(')'))
@ -998,7 +998,7 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
} }
if (error) if (error)
{ {
FScriptPosition::ErrorCounter++; FScriptPosition::ErrorCounter += error;
} }
else if (cls->Symbols.AddSymbol (sym) == NULL) else if (cls->Symbols.AddSymbol (sym) == NULL)
{ {