gcc 4.1 compile fixes.

This commit is contained in:
Steven Fuller 2007-01-12 07:53:15 +00:00 committed by Patryk Obara
parent 030db5bb23
commit 785c016a28
7 changed files with 16 additions and 8 deletions

View file

@ -56,12 +56,12 @@
int FixP_Alpha
);
struct r2pos TextReportGadget :: GetPos_Rel
struct r2pos GetPos_Rel
(
const struct r2rect& R2Rect_Parent
) const;
r2size TextReportGadget :: GetSize
r2size GetSize
(
const struct r2rect& R2Rect_Parent
) const;

View file

@ -10,6 +10,8 @@
#include "hierchnk.hpp"
class File_Chunk;
// project specifc structure contained in rif handle
struct Project_RifHandle {};

View file

@ -103,7 +103,7 @@ struct AltTabEntry
inline bool operator != (AltTabEntry const & rEntry) const
{ return ! operator == (rEntry); }
friend inline HashFunction(AltTabEntry const & rEntry)
friend inline unsigned HashFunction(AltTabEntry const & rEntry)
{ return HashFunction(rEntry.m_pDxGraphic); }
};

View file

@ -11,6 +11,8 @@
#include "bmpnames.hpp"
#include "projload.hpp"
class Sprite_Header_Chunk;
#if 0
extern BOOL copy_to_mainshpl (Shape_Chunk *shape, int list_pos);
extern BOOL copy_to_mainshpl (Shape_Sub_Shape_Chunk *shape, int list_pos);

View file

@ -365,7 +365,7 @@ public:
virtual void fill_data_block_for_process(char * data_start);
Chunk* Chunk_With_Children::DynCreate(const char* data);
Chunk* DynCreate(const char* data);
protected:

View file

@ -7,6 +7,8 @@
#include "palette.h"
#endif
class Environment_Data_Chunk;
static const unsigned char * grab_pixel_data(int ssize, unsigned char const * sdata)
{
if (!ssize) return 0;

View file

@ -219,12 +219,14 @@ namespace IFF
} // namespace IFF
inline unsigned HashFunction(IFF::RegEntry const & rEntry)
{
return HashFunction(rEntry.m_idChunk.m_nID);
}
namespace IFF {
inline unsigned HashFunction(IFF::RegEntry const & rEntry)
{
return ::HashFunction(rEntry.m_idChunk.m_nID);
}
static ::HashTable<RegEntry> * g_pRegister = NULL;