summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2011-02-12 21:25:18 +0000
committerSimon Howard2011-02-12 21:25:18 +0000
commit4a833cdb45aaf25b6419217a587816ebab5f5bfa (patch)
tree18be334b10a38fe7febcfdcc946640326bc7b5c3
parentf7c88d8dd307a277bbecf1b64a916d8d9dbb060e (diff)
downloadchocolate-doom-4a833cdb45aaf25b6419217a587816ebab5f5bfa.tar.gz
chocolate-doom-4a833cdb45aaf25b6419217a587816ebab5f5bfa.tar.bz2
chocolate-doom-4a833cdb45aaf25b6419217a587816ebab5f5bfa.zip
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
-rw-r--r--configure.in3
-rw-r--r--opl/dbopl.c3
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;
}