--- 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);
 }