diff options
| author | Steven Fuller <relnev@icculus.org> | 2007-01-12 07:53:15 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 785c016a2867676a041e27ce25e33c67f026fa4e (patch) | |
| tree | 6b653f46ddd5ff737eb19e4496ad041e021b7817 /src/win95 | |
| parent | 030db5bb236344370342447d31a3d685dd93ad92 (diff) | |
gcc 4.1 compile fixes.
Diffstat (limited to 'src/win95')
| -rw-r--r-- | src/win95/alt_tab.cpp | 2 | ||||
| -rw-r--r-- | src/win95/chnkload.hpp | 2 | ||||
| -rw-r--r-- | src/win95/chunk.hpp | 2 | ||||
| -rw-r--r-- | src/win95/chunkpal.hpp | 2 | ||||
| -rw-r--r-- | src/win95/iff.cpp | 10 |
5 files changed, 12 insertions, 6 deletions
diff --git a/src/win95/alt_tab.cpp b/src/win95/alt_tab.cpp index 529abcb..c1c3e2f 100644 --- a/src/win95/alt_tab.cpp +++ b/src/win95/alt_tab.cpp @@ -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); } }; diff --git a/src/win95/chnkload.hpp b/src/win95/chnkload.hpp index adf2163..e5db4e9 100644 --- a/src/win95/chnkload.hpp +++ b/src/win95/chnkload.hpp @@ -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); diff --git a/src/win95/chunk.hpp b/src/win95/chunk.hpp index e021062..bb58380 100644 --- a/src/win95/chunk.hpp +++ b/src/win95/chunk.hpp @@ -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: diff --git a/src/win95/chunkpal.hpp b/src/win95/chunkpal.hpp index 534eff9..c293072 100644 --- a/src/win95/chunkpal.hpp +++ b/src/win95/chunkpal.hpp @@ -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; diff --git a/src/win95/iff.cpp b/src/win95/iff.cpp index 4e176d6..d7581b3 100644 --- a/src/win95/iff.cpp +++ b/src/win95/iff.cpp @@ -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; |