gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes to compiling with gcc 4.6

This commit is contained in:
niczkx 2012-08-03 15:03:34 -06:00
parent 7d62763c92
commit 092876d0e1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/const.h
View File

@ -45,7 +45,7 @@
#if defined(__amd64) || defined(_M_X64) #if defined(__amd64) || defined(_M_X64)
#define BUILD_ARCH "x64" #define BUILD_ARCH "x64"
#elif defined(__i386) || defined(_M_IX86) || defined(_X86_) #elif defined(__i386) || defined(_M_IX86) || defined(_X86_)
#define BUILD_ARCH "X86" #define BUILD_ARCH "x86"
#else #else
#define BUILD_ARCH "unknown" #define BUILD_ARCH "unknown"
#endif #endif

4
src/framework/sound/soundfile.h
View File

@ -33,8 +33,8 @@ public:
virtual ~SoundFile() { } virtual ~SoundFile() { }
static SoundFilePtr loadSoundFile(const std::string& filename); static SoundFilePtr loadSoundFile(const std::string& filename);
virtual int read(void *buffer, int bufferSize) = 0; virtual int read(void *buffer, int bufferSize) { return -1; }
virtual void reset() = 0; virtual void reset() { }
bool eof() { return m_file->eof(); } bool eof() { return m_file->eof(); }
ALenum getSampleFormat(); ALenum getSampleFormat();

2
src/framework/ui/uilayout.h
View File

@ -55,7 +55,7 @@ public:
virtual bool isUIGridLayout() { return false; } virtual bool isUIGridLayout() { return false; }
protected: protected:
virtual bool internalUpdate() { } virtual bool internalUpdate() { return false; }
int m_updateDisabled; int m_updateDisabled;
stdext::boolean<false> m_updating; stdext::boolean<false> m_updating;