diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
| commit | 7811d7209a9ebb207979269c764831ef818521b5 (patch) | |
| tree | 74504d69828bf671f179296b4ed86cff0e13cf5b /intern | |
| parent | e79db85cc18d378fc2dc6d30f0fb69d04e066f68 (diff) | |
Bunch of gcc 4.0 warning fixes.
source/creator/creator.c
changed ifdef's around fpe_handler to match when its actually used.
intern/SoundSystem/intern/SND_AudioDevice.cpp
Changed: SND_SoundObject* oldobject = oldobject = pIdObject->GetSoundObject();
to: SND_SoundObject* oldobject = pIdObject->GetSoundObject();
intern/SoundSystem/openal/SND_OpenALDevice.cpp
removed unused var.
source/blender/blenkernel/intern/mball.c
initalized a couple of vars that might have been used uninitalized.
The rest were changing types to match, most of them were something like
was short * should have been unsigned short *.
Kent
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/SoundSystem/intern/SND_AudioDevice.cpp | 6 | ||||
| -rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/intern/SoundSystem/intern/SND_AudioDevice.cpp b/intern/SoundSystem/intern/SND_AudioDevice.cpp index 9cb2202425c..828edaed4b4 100644 --- a/intern/SoundSystem/intern/SND_AudioDevice.cpp +++ b/intern/SoundSystem/intern/SND_AudioDevice.cpp @@ -32,10 +32,6 @@ #include "SND_AudioDevice.h" #include "SND_SoundObject.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef WIN32 // This warning tells us about truncation of __long__ stl-generated names. // It can occasionally cause DevStudio to have internal compiler warnings. @@ -141,7 +137,7 @@ bool SND_AudioDevice::GetNewId(SND_SoundObject* pObject) if (!OutOfIds) { - SND_SoundObject* oldobject = oldobject = pIdObject->GetSoundObject(); + SND_SoundObject* oldobject = pIdObject->GetSoundObject(); // revoke the old object if present if (oldobject) diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 66950e6ef92..fdad75db767 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -31,10 +31,6 @@ * SND_OpenALDevice derived from SND_IAudioDevice */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef WIN32 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning #endif //WIN32 @@ -402,7 +398,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, #ifdef OUDE_OPENAL unsigned int samplerate, numberofsamples; // openal_2.12 #else - int samplerate, numberofsamples, frequency; // openal_2.14+ + int samplerate, numberofsamples; // openal_2.14+ #endif /* Give them some safe defaults just incase */ |