diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-18 19:07:23 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-18 19:07:23 +0000 |
| commit | c9d6b2beb19f80e43fec9aa61d80cc8a62233c33 (patch) | |
| tree | 2f6ce39235e215b3905fe4c4f0f8651a6e6793df /code/qcommon/common.c | |
| parent | e89fbb8fbef8c74d202565c100ff57b04f1a60dc (diff) | |
| download | ioquake3-aero-c9d6b2beb19f80e43fec9aa61d80cc8a62233c33.tar.gz ioquake3-aero-c9d6b2beb19f80e43fec9aa61d80cc8a62233c33.zip | |
- change long to intptr_t for 64bit windows compatability
- change vmMain arguments back to int. 64bit types are apparently not
needed there. Only the syscall function needs them.
git-svn-id: svn://svn.icculus.org/quake3/trunk@550 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/common.c')
| -rw-r--r-- | code/qcommon/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/code/qcommon/common.c b/code/qcommon/common.c index 7848dee..a464125 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -928,7 +928,7 @@ void *Z_TagMalloc( int size, int tag ) { // size += sizeof(memblock_t); // account for size of block header size += 4; // space for memory trash tester - size = PAD(size, sizeof(long)); // align to 32/64 bit boundary + size = PAD(size, sizeof(intptr_t)); // align to 32/64 bit boundary base = rover = zone->rover; start = base->prev; @@ -1530,7 +1530,7 @@ void Com_InitHunkMemory( void ) { Com_Error( ERR_FATAL, "Hunk data failed to allocate %i megs", s_hunkTotal / (1024*1024) ); } // cacheline align - s_hunkData = (byte *) ( ( (long)s_hunkData + 31 ) & ~31 ); + s_hunkData = (byte *) ( ( (intptr_t)s_hunkData + 31 ) & ~31 ); Hunk_Clear(); Cmd_AddCommand( "meminfo", Com_Meminfo_f ); @@ -1750,7 +1750,7 @@ void *Hunk_AllocateTempMemory( int size ) { Hunk_SwapBanks(); - size = PAD(size, sizeof(long)) + sizeof( hunkHeader_t ); + size = PAD(size, sizeof(intptr_t)) + sizeof( hunkHeader_t ); if ( hunk_temp->temp + hunk_permanent->permanent + size > s_hunkTotal ) { Com_Error( ERR_DROP, "Hunk_AllocateTempMemory: failed on %i", size ); |