Browse Source

fixed a ridiculous number of gcc warnings, nearly all of which were complaints about unused parameters - the remaining 199 warnings I get are from code that isn't ours (box2d is responsible for all but 8 of them)

Bill Meltsner 15 years ago
parent
commit
7c33786100

+ 4 - 0
platform/macosx/love.xcodeproj/project.pbxproj

@@ -593,6 +593,7 @@
 		A9B4BA991045937F001DBC80 /* wrap_ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_ParticleSystem.h; sourceTree = "<group>"; };
 		A9B4BA991045937F001DBC80 /* wrap_ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_ParticleSystem.h; sourceTree = "<group>"; };
 		A9B4BA9A1045937F001DBC80 /* ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleSystem.cpp; sourceTree = "<group>"; };
 		A9B4BA9A1045937F001DBC80 /* ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleSystem.cpp; sourceTree = "<group>"; };
 		A9B4BA9B1045937F001DBC80 /* wrap_ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_ParticleSystem.cpp; sourceTree = "<group>"; };
 		A9B4BA9B1045937F001DBC80 /* wrap_ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_ParticleSystem.cpp; sourceTree = "<group>"; };
+		A9BFAA851137C1CE005FE0AD /* ThreadModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadModule.h; sourceTree = "<group>"; };
 		A9CF0E8410B9EB1000E6F37E /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
 		A9CF0E8410B9EB1000E6F37E /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
 		A9CF0E8510B9EB1000E6F37E /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = "<group>"; };
 		A9CF0E8510B9EB1000E6F37E /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = "<group>"; };
 		A9D307E9106635C3004FEDF8 /* physfs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = physfs.framework; path = /Library/Frameworks/physfs.framework; sourceTree = "<absolute>"; };
 		A9D307E9106635C3004FEDF8 /* physfs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = physfs.framework; path = /Library/Frameworks/physfs.framework; sourceTree = "<absolute>"; };
@@ -1393,6 +1394,7 @@
 		A986DEAF113249A700810279 /* thread */ = {
 		A986DEAF113249A700810279 /* thread */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
+				A9BFAA851137C1CE005FE0AD /* ThreadModule.h */,
 				A986DEB0113249A800810279 /* sdl */,
 				A986DEB0113249A800810279 /* sdl */,
 			);
 			);
 			path = thread;
 			path = thread;
@@ -1782,6 +1784,8 @@
 				GCC_WARN_SHADOW = NO;
 				GCC_WARN_SHADOW = NO;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
+				GCC_WARN_UNUSED_PARAMETER = NO;
+				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 				HEADER_SEARCH_PATHS = (
 					/Library/Frameworks/Lua.framework/Headers,
 					/Library/Frameworks/Lua.framework/Headers,

+ 2 - 2
src/common/runtime.h

@@ -252,7 +252,7 @@ namespace love
 	**/
 	**/
 	int luax_getregistry(lua_State * L, Registry r);
 	int luax_getregistry(lua_State * L, Registry r);
 
 
-	Type luax_type(lua_State * L, int idx);
+	Type luax_type(lua_State * L, int idx);
 
 
 	/**
 	/**
 	* Converts the value at idx to the specified type without checking that
 	* Converts the value at idx to the specified type without checking that
@@ -264,7 +264,7 @@ namespace love
 	* @param type The type bit.
 	* @param type The type bit.
 	**/
 	**/
 	template <typename T>
 	template <typename T>
-	T * luax_totype(lua_State * L, int idx, const char * name, love::bits type)
+	T * luax_totype(lua_State * L, int idx, const char *, love::bits)
 	{
 	{
 		return (T*)(((Proxy *)lua_touserdata(L, idx))->data);
 		return (T*)(((Proxy *)lua_touserdata(L, idx))->data);
 	}
 	}

+ 13 - 13
src/modules/audio/null/Audio.cpp

@@ -39,12 +39,12 @@ namespace null
 		return "love.audio.null";
 		return "love.audio.null";
 	}
 	}
 
 
-	love::audio::Source * Audio::newSource(love::sound::Decoder * decoder)
+	love::audio::Source * Audio::newSource(love::sound::Decoder *)
 	{
 	{
 		return new Source();
 		return new Source();
 	}
 	}
 
 
-	love::audio::Source * Audio::newSource(love::sound::SoundData * soundData)
+	love::audio::Source * Audio::newSource(love::sound::SoundData *)
 	{
 	{
 		return new Source();
 		return new Source();
 	}
 	}
@@ -59,7 +59,7 @@ namespace null
 		return 0;
 		return 0;
 	}
 	}
 
 
-	void Audio::play(love::audio::Source * source)
+	void Audio::play(love::audio::Source *)
 	{
 	{
 	}
 	}
 
 
@@ -67,7 +67,7 @@ namespace null
 	{
 	{
 	}
 	}
 
 
-	void Audio::stop(love::audio::Source * source)
+	void Audio::stop(love::audio::Source *)
 	{
 	{
 	}
 	}
 
 
@@ -75,7 +75,7 @@ namespace null
 	{
 	{
 	}
 	}
 
 
-	void Audio::pause(love::audio::Source * source)
+	void Audio::pause(love::audio::Source *)
 	{
 	{
 	}
 	}
 
 
@@ -83,7 +83,7 @@ namespace null
 	{
 	{
 	}
 	}
 
 
-	void Audio::resume(love::audio::Source * source)
+	void Audio::resume(love::audio::Source *)
 	{
 	{
 	}
 	}
 
 
@@ -91,7 +91,7 @@ namespace null
 	{
 	{
 	}
 	}
 
 
-	void Audio::rewind(love::audio::Source * source)
+	void Audio::rewind(love::audio::Source *)
 	{
 	{
 	}
 	}
 
 
@@ -109,27 +109,27 @@ namespace null
 		return volume;
 		return volume;
 	}
 	}
 
 
-	void Audio::getPosition(float * v) const
+	void Audio::getPosition(float *) const
 	{
 	{
 	}
 	}
 
 
-	void Audio::setPosition(float * v)
+	void Audio::setPosition(float *)
 	{
 	{
 	}
 	}
 
 
-	void Audio::getOrientation(float * v) const
+	void Audio::getOrientation(float *) const
 	{
 	{
 	}
 	}
 
 
-	void Audio::setOrientation(float * v)
+	void Audio::setOrientation(float *)
 	{
 	{
 	}
 	}
 
 
-	void Audio::getVelocity(float * v) const
+	void Audio::getVelocity(float *) const
 	{
 	{
 	}
 	}
 
 
-	void Audio::setVelocity(float * v)
+	void Audio::setVelocity(float *)
 	{
 	{
 	}
 	}
 
 

+ 32 - 32
src/modules/audio/null/Audio.h

@@ -1,21 +1,21 @@
-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 **/
 
 
 #ifndef LOVE_AUDIO_NULL_AUDIO_H
 #ifndef LOVE_AUDIO_NULL_AUDIO_H
@@ -44,22 +44,22 @@ namespace null
 		// Implements Module.
 		// Implements Module.
 		const char * getName() const;
 		const char * getName() const;
 
 
-		// Implements Audio.
+		// Implements Audio.
 		love::audio::Source * newSource(love::sound::Decoder * decoder);
 		love::audio::Source * newSource(love::sound::Decoder * decoder);
-		love::audio::Source * newSource(love::sound::SoundData * soundData);
+		love::audio::Source * newSource(love::sound::SoundData * soundData);
 		int getNumSources() const;
 		int getNumSources() const;
-		int getMaxSources() const;
-		void play(love::audio::Source * source);
-		void play();
-		void stop(love::audio::Source * source);
-		void stop();
-		void pause(love::audio::Source * source);
-		void pause();
-		void resume(love::audio::Source * source);
-		void resume();
-		void rewind(love::audio::Source * source);
-		void rewind();
-		void setVolume(float volume);
+		int getMaxSources() const;
+		void play(love::audio::Source * source);
+		void play();
+		void stop(love::audio::Source * source);
+		void stop();
+		void pause(love::audio::Source * source);
+		void pause();
+		void resume(love::audio::Source * source);
+		void resume();
+		void rewind(love::audio::Source * source);
+		void rewind();
+		void setVolume(float volume);
 		float getVolume() const;
 		float getVolume() const;
 
 
 		void getPosition(float * v) const;
 		void getPosition(float * v) const;

+ 54 - 54
src/modules/audio/null/Source.cpp

@@ -1,21 +1,21 @@
-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
 **/
 **/
 
 
 #include "Source.h"
 #include "Source.h"
@@ -34,22 +34,22 @@ namespace null
 
 
 	Source::~Source()
 	Source::~Source()
 	{
 	{
-	}
-
-	love::audio::Source * Source::copy()
-	{
-		this->retain();
-		return this;
-	}
-
+	}
+
+	love::audio::Source * Source::copy()
+	{
+		this->retain();
+		return this;
+	}
+
 	void Source::play()
 	void Source::play()
 	{
 	{
 	}
 	}
-
+
 	void Source::stop()
 	void Source::stop()
 	{
 	{
 	}
 	}
-
+
 	void Source::pause()
 	void Source::pause()
 	{
 	{
 	}
 	}
@@ -61,7 +61,7 @@ namespace null
 	void Source::rewind()
 	void Source::rewind()
 	{
 	{
 	}
 	}
-
+
 	bool Source::isStopped() const
 	bool Source::isStopped() const
 	{
 	{
 		return true;		
 		return true;		
@@ -75,56 +75,56 @@ namespace null
 	void Source::update()
 	void Source::update()
 	{
 	{
 	}
 	}
-
+
 	void Source::setPitch(float pitch)
 	void Source::setPitch(float pitch)
 	{
 	{
 		this->pitch = pitch;
 		this->pitch = pitch;
 	}
 	}
-
+
 	float Source::getPitch() const
 	float Source::getPitch() const
 	{
 	{
 		return pitch;
 		return pitch;
 	}
 	}
-
+
 	void Source::setVolume(float volume)
 	void Source::setVolume(float volume)
 	{
 	{
 		this->volume = volume;
 		this->volume = volume;
 	}
 	}
-
+
 	float Source::getVolume() const
 	float Source::getVolume() const
 	{
 	{
 		return volume;
 		return volume;
 	}
 	}
 
 
-	void Source::setPosition(float * v)
+	void Source::setPosition(float *)
 	{
 	{
-	}
-
-	void Source::getPosition(float * v) const
+	}
+
+	void Source::getPosition(float *) const
+	{
+	}
+
+	void Source::setVelocity(float *)
 	{
 	{
-	}
-
-	void Source::setVelocity(float * v)
+	}
+
+	void Source::getVelocity(float *) const
 	{
 	{
-	}
-
-	void Source::getVelocity(float * v) const
+	}
+
+	void Source::setDirection(float *)
 	{
 	{
-	}
-
-	void Source::setDirection(float * v)
+	}
+
+	void Source::getDirection(float *) const
 	{
 	{
-	}
-
-	void Source::getDirection(float * v) const
+	}
+
+	void Source::setLooping(bool looping)
 	{
 	{
+		this->looping = looping;
 	}
 	}
 
 
-	void Source::setLooping(bool looping)
-	{
-		this->looping = looping;
-	}
-
 	bool Source::isLooping() const
 	bool Source::isLooping() const
 	{
 	{
 		return looping;
 		return looping;

+ 1 - 1
src/modules/event/sdl/wrap_Event.cpp

@@ -132,7 +132,7 @@ namespace sdl
 		return 0;
 		return 0;
 	}
 	}
 
 
-	int w_pump(lua_State * L)
+	int w_pump(lua_State *)
 	{
 	{
 		instance->pump();
 		instance->pump();
 		return 0;
 		return 0;

+ 2 - 2
src/modules/font/ImageRasterizer.cpp

@@ -27,7 +27,7 @@ namespace love
 {
 {
 namespace font
 namespace font
 {
 {
-	ImageRasterizer::ImageRasterizer(love::image::ImageData * data, unsigned short * glyphs)
+	ImageRasterizer::ImageRasterizer(love::image::ImageData * data, unsigned short *)
 		: imageData(data)
 		: imageData(data)
 	{
 	{
 		imageData->retain();
 		imageData->retain();
@@ -43,7 +43,7 @@ namespace font
 		return getHeight();
 		return getHeight();
 	}
 	}
 
 
-	GlyphData * ImageRasterizer::getGlyphData(unsigned short glyph) const
+	GlyphData * ImageRasterizer::getGlyphData(unsigned short) const
 	{
 	{
 		return 0;
 		return 0;
 	}
 	}

+ 3 - 2
src/modules/graphics/opengl/Graphics.cpp

@@ -38,7 +38,8 @@ namespace opengl
 		currentMode.height = 0;
 		currentMode.height = 0;
 
 
 		// Window should be centered.
 		// Window should be centered.
-		SDL_putenv("SDL_VIDEO_CENTERED=center");
+		char * center = "SDL_VIDEO_CENTERED=center";
+		SDL_putenv(center);
 
 
 		if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
 		if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
 			throw Exception(SDL_GetError());
 			throw Exception(SDL_GetError());
@@ -423,7 +424,7 @@ namespace opengl
 		return font;
 		return font;
 	}
 	}
 
 
-	Font * Graphics::newImageFont(Image * image, const char * glyphs, float spacing)
+	Font * Graphics::newImageFont(Image * image, const char * glyphs, float)
 	{
 	{
 		Font * font = new ImageFont(image, std::string(glyphs));
 		Font * font = new ImageFont(image, std::string(glyphs));
 
 

+ 5 - 5
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -58,19 +58,19 @@ namespace opengl
 		return 1;
 		return 1;
 	}
 	}
 
 
-	int w_reset(lua_State * L)
+	int w_reset(lua_State *)
 	{
 	{
 		instance->reset();
 		instance->reset();
 		return 0;
 		return 0;
 	}
 	}
 
 
-	int w_clear(lua_State * L)
+	int w_clear(lua_State *)
 	{
 	{
 		instance->clear();
 		instance->clear();
 		return 0;
 		return 0;
 	}
 	}
 
 
-	int w_present(lua_State * L)
+	int w_present(lua_State *)
 	{
 	{
 		instance->present();
 		instance->present();
 		return 0;
 		return 0;
@@ -748,13 +748,13 @@ namespace opengl
 		return instance->polygon(L);
 		return instance->polygon(L);
 	}
 	}
 
 
-	int w_push(lua_State * L)
+	int w_push(lua_State *)
 	{
 	{
 		instance->push();
 		instance->push();
 		return 0;
 		return 0;
 	}
 	}
 
 
-	int w_pop(lua_State * L)
+	int w_pop(lua_State *)
 	{
 	{
 		instance->pop();
 		instance->pop();
 		return 0;
 		return 0;

+ 14 - 14
src/modules/sound/lullaby/Mpg123Decoder.cpp

@@ -34,7 +34,7 @@ namespace lullaby
 	bool Mpg123Decoder::inited = false;
 	bool Mpg123Decoder::inited = false;
 
 
 	Mpg123Decoder::Mpg123Decoder(Data * data, const std::string & ext, int bufferSize, int sampleRate)
 	Mpg123Decoder::Mpg123Decoder(Data * data, const std::string & ext, int bufferSize, int sampleRate)
-		: Decoder(data, ext, bufferSize, sampleRate), channels(MPG123_STEREO), handle(0)
+		: Decoder(data, ext, bufferSize, sampleRate), handle(0), channels(MPG123_STEREO)
 	{
 	{
 
 
 		data_size = data->getSize();
 		data_size = data->getSize();
@@ -195,17 +195,17 @@ namespace lullaby
 		return true;
 		return true;
 	}
 	}
 
 
-	int Mpg123Decoder::getChannels() const
-	{
-		return channels;
-	}
-
-	int Mpg123Decoder::getBits() const
-	{
-		return 16;
-	}
-
-	int Mpg123Decoder::feed(int bytes)
+	int Mpg123Decoder::getChannels() const
+	{
+		return channels;
+	}
+
+	int Mpg123Decoder::getBits() const
+	{
+		return 16;
+	}
+
+	int Mpg123Decoder::feed(int bytes)
 	{
 	{
 		int remaining = data_size - data_offset;
 		int remaining = data_size - data_offset;
 
 
@@ -219,8 +219,8 @@ namespace lullaby
 		if(r == MPG123_OK || r == MPG123_DONE)
 		if(r == MPG123_OK || r == MPG123_DONE)
 			data_offset += feed_bytes;
 			data_offset += feed_bytes;
 
 
-		return r;
-	}
+		return r;
+	}
 
 
 } // lullaby
 } // lullaby
 } // sound
 } // sound

+ 1 - 1
src/modules/sound/lullaby/VorbisDecoder.cpp

@@ -33,7 +33,7 @@ namespace lullaby
 	/**
 	/**
 	* CALLBACK FUNCTIONS
 	* CALLBACK FUNCTIONS
 	**/
 	**/
-	int vorbisClose(void * datasource	/* ptr to the data that the vorbis files need*/)
+	int vorbisClose(void *	/* ptr to the data that the vorbis files need*/)
 	{
 	{
 		// Does nothing (handled elsewhere)
 		// Does nothing (handled elsewhere)
 		return 1;
 		return 1;

+ 9 - 3
src/modules/thread/sdl/wrap_Thread.cpp

@@ -86,11 +86,13 @@ namespace sdl
 				lua_pushlightuserdata(L, v->data.userdata);
 				lua_pushlightuserdata(L, v->data.userdata);
 				break;
 				break;
 			case FUSERDATA:
 			case FUSERDATA:
-				const char *name;
+			{
+				const char *name = NULL;
 				love::types.find(v->udatatype, name);
 				love::types.find(v->udatatype, name);
 				((love::Object *) v->data.userdata)->retain();
 				((love::Object *) v->data.userdata)->retain();
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				break;
 				break;
+			}
 			default:
 			default:
 				lua_pushnil(L);
 				lua_pushnil(L);
 				break;
 				break;
@@ -126,11 +128,13 @@ namespace sdl
 				lua_pushlightuserdata(L, v->data.userdata);
 				lua_pushlightuserdata(L, v->data.userdata);
 				break;
 				break;
 			case FUSERDATA:
 			case FUSERDATA:
-				const char *name;
+			{
+				const char *name = NULL;
 				types.find(v->udatatype, name);
 				types.find(v->udatatype, name);
 				((love::Object *) v->data.userdata)->retain();
 				((love::Object *) v->data.userdata)->retain();
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				break;
 				break;
+			}
 			default:
 			default:
 				lua_pushnil(L);
 				lua_pushnil(L);
 				break;
 				break;
@@ -165,11 +169,13 @@ namespace sdl
 				lua_pushlightuserdata(L, v->data.userdata);
 				lua_pushlightuserdata(L, v->data.userdata);
 				break;
 				break;
 			case FUSERDATA:
 			case FUSERDATA:
-				const char *name;
+			{
+				const char *name = NULL;
 				types.find(v->udatatype, name);
 				types.find(v->udatatype, name);
 				((love::Object *) v->data.userdata)->retain();
 				((love::Object *) v->data.userdata)->retain();
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				luax_newtype(L, name, v->flags, v->data.userdata);
 				break;
 				break;
+			}
 			default:
 			default:
 				lua_pushnil(L);
 				lua_pushnil(L);
 				break;
 				break;

+ 8 - 8
src/modules/timer/sdl/wrap_Timer.cpp

@@ -29,7 +29,7 @@ namespace sdl
 {
 {
 	static Timer * instance = 0;
 	static Timer * instance = 0;
 
 
-	int w_step(lua_State * L)
+	int w_step(lua_State *)
 	{
 	{
 		instance->step();
 		instance->step();
 		return 0;
 		return 0;
@@ -94,13 +94,13 @@ namespace sdl
 		else
 		else
 			instance->retain();
 			instance->retain();
 
 
-		WrappedModule w;
-		w.module = instance;
-		w.name = "timer";
-		w.flags = MODULE_T;
-		w.functions = functions;
-		w.types = 0;
-
+		WrappedModule w;
+		w.module = instance;
+		w.name = "timer";
+		w.flags = MODULE_T;
+		w.functions = functions;
+		w.types = 0;
+
 		return luax_register_module(L, w);
 		return luax_register_module(L, w);
 	}
 	}