mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-01-18 23:52:02 +00:00
- Fixed copy pasta errors in autosegs.h and other problems for GCC.
SVN r1404 (trunk)
This commit is contained in:
parent
7ee11638f2
commit
70aa9cb92a
4 changed files with 9 additions and 8 deletions
|
@ -41,13 +41,13 @@
|
||||||
#define CREG_SECTION "__DATA,creg"
|
#define CREG_SECTION "__DATA,creg"
|
||||||
#define GREG_SECTION "__DATA,greg"
|
#define GREG_SECTION "__DATA,greg"
|
||||||
#define MREG_SECTION "__DATA,mreg"
|
#define MREG_SECTION "__DATA,mreg"
|
||||||
#define MREG_SECTION "__DATA,yreg"
|
#define YREG_SECTION "__DATA,yreg"
|
||||||
#else
|
#else
|
||||||
#define AREG_SECTION "areg"
|
#define AREG_SECTION "areg"
|
||||||
#define CREG_SECTION "creg"
|
#define CREG_SECTION "creg"
|
||||||
#define GREG_SECTION "greg"
|
#define GREG_SECTION "greg"
|
||||||
#define MREG_SECTION "mreg"
|
#define MREG_SECTION "mreg"
|
||||||
#define GREG_SECTION "yreg"
|
#define YREG_SECTION "yreg"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -214,7 +214,7 @@ CCMD (mapchecksum)
|
||||||
{
|
{
|
||||||
Printf("Usage: mapchecksum <map> ...\n");
|
Printf("Usage: mapchecksum <map> ...\n");
|
||||||
}
|
}
|
||||||
for (unsigned int i = 1; i < argv.argc(); ++i)
|
for (int i = 1; i < argv.argc(); ++i)
|
||||||
{
|
{
|
||||||
map = P_OpenMapData(argv[i]);
|
map = P_OpenMapData(argv[i]);
|
||||||
if (map == NULL)
|
if (map == NULL)
|
||||||
|
@ -225,7 +225,7 @@ CCMD (mapchecksum)
|
||||||
{
|
{
|
||||||
map->GetChecksum(cksum);
|
map->GetChecksum(cksum);
|
||||||
delete map;
|
delete map;
|
||||||
for (int j = 0; j < sizeof(cksum); ++j)
|
for (size_t j = 0; j < sizeof(cksum); ++j)
|
||||||
{
|
{
|
||||||
Printf("%02X", cksum[j]);
|
Printf("%02X", cksum[j]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@ void MD5Context::Update(FileReader *file, unsigned len)
|
||||||
|
|
||||||
while (len != 0)
|
while (len != 0)
|
||||||
{
|
{
|
||||||
t = MIN(len, sizeof(readbuf));
|
t = MIN<long>(len, sizeof(readbuf));
|
||||||
len -= t;
|
len -= t;
|
||||||
t = file->Read(readbuf, t);
|
t = file->Read(readbuf, t);
|
||||||
Update(readbuf, t);
|
Update(readbuf, t);
|
||||||
|
@ -249,8 +249,6 @@ MD5Transform(DWORD buf[4], const DWORD in[16])
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "c_dispatch.h"
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// CCMD md5sum
|
// CCMD md5sum
|
||||||
|
@ -259,6 +257,9 @@ MD5Transform(DWORD buf[4], const DWORD in[16])
|
||||||
//
|
//
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
||||||
|
#include "c_dispatch.h"
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
CCMD (md5sum)
|
CCMD (md5sum)
|
||||||
{
|
{
|
||||||
if (argv.argc() < 2)
|
if (argv.argc() < 2)
|
||||||
|
|
|
@ -149,7 +149,7 @@ void FTeam::ParseTeamInfo ()
|
||||||
|
|
||||||
if (Teams.Size () < 2)
|
if (Teams.Size () < 2)
|
||||||
I_FatalError ("ParseTeamInfo: At least two teams must be defined in TEAMINFO.");
|
I_FatalError ("ParseTeamInfo: At least two teams must be defined in TEAMINFO.");
|
||||||
else if (Teams.Size () > TEAM_MAXIMUM)
|
else if (Teams.Size () > (unsigned)TEAM_MAXIMUM)
|
||||||
I_FatalError ("ParseTeamInfo: Too many teams defined. (Maximum: %d)", TEAM_MAXIMUM);
|
I_FatalError ("ParseTeamInfo: Too many teams defined. (Maximum: %d)", TEAM_MAXIMUM);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue