--- a/config.lib	Sun Jun 01 13:23:40 2008 +0000
+++ b/config.lib	Sun Jun 01 15:08:14 2008 +0000
@@ -936,6 +936,10 @@
 		if [ $cc_version -ge 30 ]; then
 			CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
 			CFLAGS="$CFLAGS -Wredundant-decls"
+			# Do not warn about unused variables when building without asserts
+			if [ $enable_assert -eq 0 ]; then
+				CFLAGS="$CFLAGS -Wno-unused-variable"
+			fi
 		fi
 
 		if [ $cc_version -ge 34 ]; then

--- a/src/blitter/factory.hpp	Sun Jun 01 13:23:40 2008 +0000
+++ b/src/blitter/factory.hpp	Sun Jun 01 15:08:14 2008 +0000
@@ -43,11 +43,8 @@
 		if (name == NULL) return;
 
 		this->name = strdup(name);
-#if !defined(NDEBUG) || defined(WITH_ASSERT)
-		/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
-		std::pair<Blitters::iterator, bool> P =
-#endif /* !NDEBUG */
-		GetBlitters().insert(Blitters::value_type(name, this));
+
+		std::pair<Blitters::iterator, bool> P = GetBlitters().insert(Blitters::value_type(name, this));
 		assert(P.second);
 	}
 

--- a/src/driver.cpp	Sun Jun 01 13:23:40 2008 +0000
+++ b/src/driver.cpp	Sun Jun 01 15:08:14 2008 +0000
@@ -156,11 +156,7 @@
 	strecpy(buf, GetDriverTypeName(type), lastof(buf));
 	strecpy(buf + 5, name, lastof(buf));
 
-#if !defined(NDEBUG) || defined(WITH_ASSERT)
-	/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
-	std::pair<Drivers::iterator, bool> P =
-#endif /* !NDEBUG */
-	GetDrivers().insert(Drivers::value_type(buf, this));
+	std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
 	assert(P.second);
 }
 

--- a/src/gfxinit.cpp	Sun Jun 01 13:23:40 2008 +0000
+++ b/src/gfxinit.cpp	Sun Jun 01 15:08:14 2008 +0000
@@ -71,12 +71,8 @@
 		uint end = *index_tbl++;
 
 		do {
-		#ifdef NDEBUG
-			LoadNextSprite(start, file_index, *sprite_id);
-		#else
 			bool b = LoadNextSprite(start, file_index, *sprite_id);
 			assert(b);
-		#endif
 			(*sprite_id)++;
 		} while (++start <= end);
 	}

--- a/src/newgrf_engine.cpp	Sun Jun 01 13:23:40 2008 +0000
+++ b/src/newgrf_engine.cpp	Sun Jun 01 15:08:14 2008 +0000
@@ -886,23 +886,19 @@
 
 SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle *v, bool info_view)
 {
-	#if !defined(NDEBUG) || defined(WITH_ASSERT)
 	const Engine *e = GetEngine(engine);
-	#endif /* !defined(NDEBUG) || defined(WITH_ASSERT) */
-
-	const SpriteGroup *group;
-	ResolverObject object;
-
-	assert(e->type == VEH_AIRCRAFT);
 
 	/* Only valid for helicopters */
+	assert(e->type == VEH_AIRCRAFT);
 	assert(!(e->u.air.subtype & AIR_CTOL));
 
+	ResolverObject object;
+
 	NewVehicleResolver(&object, engine, v);
 
 	object.info_view = info_view;
 
-	group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
+	const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
 	group = Resolve(group, &object);
 
 	if (group == NULL || group->type != SGT_RESULT) return 0;

--- a/src/town_cmd.cpp	Sun Jun 01 13:23:40 2008 +0000
+++ b/src/town_cmd.cpp	Sun Jun 01 15:08:14 2008 +0000
@@ -1639,11 +1639,7 @@
  */
 static inline void ClearMakeHouseTile(TileIndex tile, TownID tid, byte counter, byte stage, HouseID type, byte random_bits)
 {
-	#if !defined(NDEBUG) || defined(WITH_ASSERT)
-		CommandCost cc =
-	#endif /* !defined(NDEBUG) || defined(WITH_ASSERT) */
-
-	DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR);
+	CommandCost cc = DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR);
 
 	assert(CmdSucceeded(cc));