commit 4a833cdb45aaf25b6419217a587816ebab5f5bfa
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Feb 12 21:25:18 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Feb 12 21:25:18 2011 +0000

    Turn on gcc warnings for declarations made in a block after a statement;
    this is not supported by the Microsoft compiler.

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 2261
---
 configure.in | 3 ++-
 opl/dbopl.c  | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 4e63d582..ebbdfbde 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,8 @@ AC_ARG_ENABLE(penis-extension,

 if test "$GCC" = "yes"
 then
-        CFLAGS="-O$OPT_LEVEL -g -Wall $orig_CFLAGS"
+        WARNINGS="-Wall -Wdeclaration-after-statement"
+        CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
 fi

 dnl Search for SDL ...
diff --git a/opl/dbopl.c b/opl/dbopl.c
index 0c21e0b6..04e37c15 100644
--- a/opl/dbopl.c
+++ b/opl/dbopl.c
@@ -412,9 +412,8 @@ static void Operator__UpdateRates(Operator *self, const Chip* chip ) {
 }

 static inline Bit32s Operator__RateForward(Operator *self, Bit32u add ) {
-	Bit32s ret; // haleyjd: GNUisms out!
 	self->rateIndex += add;
-	ret = self->rateIndex >> RATE_SH;
+	Bit32s ret = self->rateIndex >> RATE_SH;
 	self->rateIndex = self->rateIndex & RATE_MASK;
 	return ret;
 }