- Fixed GCC 4 warnings in FNodeBuilder::CreateSubsectorsForReal().
- Changed f_finale.cpp/atkstates[] into a static variable, since its anonymous type prevents it from being accessed from other files anyway. - Fixed: The behavior of the eventtail advancement in d_net.cpp/CheckAbort() was compiler-dependant. - Fixed warnings GCC 4 threw up while compiling re2c and lemon. - Removed __cdecl from makewad.c again. This is already defined as a builtin for MinGW, and redefining it produces a warning. (Why is main explicitly declared __cdecl anyway?) - Fixed building ccdv-win32 with GCC 4. GCC 4 creates a memcpy call, which won't work because it doesn't get linked with the standard C library. SVN r135 (trunk)
This commit is contained in:
parent
62b7dd3efc
commit
df799ade24
23 changed files with 2903 additions and 2158 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -23,7 +23,7 @@ int ErrorCount;
|
|||
void WriteWord (int word);
|
||||
void WriteLabel (char *label);
|
||||
void WriteWords (int count, short *array);
|
||||
void WriteBytes (int count, char *array);
|
||||
void WriteBytes (int count, unsigned char *array);
|
||||
|
||||
void WriteNameTable ();
|
||||
|
||||
|
|
@ -855,7 +855,7 @@ void WriteWords (int count, short *array)
|
|||
}
|
||||
}
|
||||
|
||||
void WriteBytes (int count, char *array)
|
||||
void WriteBytes (int count, unsigned char *array)
|
||||
{
|
||||
WriteWord (count);
|
||||
fwrite (array, 1, count, Dest);
|
||||
|
|
@ -952,7 +952,7 @@ void WriteHeights ()
|
|||
void WriteCodePConv ()
|
||||
{
|
||||
WriteLabel ("CODP");
|
||||
WriteWords (CodePMapSize, CodePMap);
|
||||
WriteWords (CodePMapSize, (short *)CodePMap);
|
||||
}
|
||||
|
||||
void WriteSprites ()
|
||||
|
|
|
|||
|
|
@ -2359,7 +2359,7 @@ static void preprocess_input(char *z){
|
|||
void Parse(gp)
|
||||
struct lemon *gp;
|
||||
{
|
||||
struct pstate ps;
|
||||
struct pstate ps = { 0, };
|
||||
FILE *fp;
|
||||
char *filebuf;
|
||||
int filesize;
|
||||
|
|
|
|||
|
|
@ -450,11 +450,7 @@ int buildwad (FILE *listfile, char *listfilename, char *makecmd, char *makefile)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if !defined(_MSC_VER)
|
||||
#define __cdecl
|
||||
#endif
|
||||
|
||||
int __cdecl main (int argc, char **argv)
|
||||
int main (int argc, char **argv)
|
||||
{
|
||||
FILE *listfile = NULL;
|
||||
char *listfilename = NULL;
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ public:
|
|||
State *state;
|
||||
public:
|
||||
Action(State*);
|
||||
virtual ~Action() {}
|
||||
virtual void emit(std::ostream&, bool&) = 0;
|
||||
virtual bool isRule() const;
|
||||
virtual bool isMatch() const;
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ inline std::ostream& operator<<(std::ostream &o, const Range *r){
|
|||
class RegExp {
|
||||
public:
|
||||
uint size;
|
||||
virtual ~RegExp() {}
|
||||
public:
|
||||
virtual char *typeOf() = 0;
|
||||
RegExp *isA(char *t)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -638,7 +638,6 @@ int yylex (void)
|
|||
{
|
||||
char token[80];
|
||||
int toksize;
|
||||
int buildup;
|
||||
int c;
|
||||
|
||||
loop:
|
||||
|
|
@ -661,7 +660,7 @@ loop:
|
|||
}
|
||||
if (isdigit (c))
|
||||
{
|
||||
buildup = c - '0';
|
||||
int buildup = c - '0';
|
||||
if (c == '0')
|
||||
{
|
||||
c = fgetc (Source);
|
||||
|
|
@ -705,6 +704,8 @@ loop:
|
|||
}
|
||||
if (isalpha (c))
|
||||
{
|
||||
int buildup = 0;
|
||||
|
||||
token[0] = c;
|
||||
toksize = 1;
|
||||
while (toksize < 79 && (isalnum (c = fgetc (Source)) || c == '_'))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue