fix -pedantic warnings

svn-id: r6108

6 files changed, 18 insertions, 19 deletions

diff --git a/common/gameDetector.h b/common/gameDetector.h
index 643fbe1cc2..98f6b8e086 100644
--- a/common/gameDetector.h
+++ b/common/gameDetector.h
@@ -56,7 +56,7 @@ enum GameId {
 
 	/* Simon the Sorcerer */
 	GID_SIMON_FIRST = 20,
-	GID_SIMON_LAST = GID_SIMON_FIRST + 8,
+	GID_SIMON_LAST = GID_SIMON_FIRST + 8
 };
 
 enum GameFeatures {
diff --git a/common/system.h b/common/system.h
index 296fb072c8..dff91ee609 100644
--- a/common/system.h
+++ b/common/system.h
@@ -56,13 +56,13 @@ public:
 		EVENT_RBUTTONDOWN = 6,
 		EVENT_RBUTTONUP = 7,
 		EVENT_WHEELUP = 8,
-		EVENT_WHEELDOWN = 9,
+		EVENT_WHEELDOWN = 9
 	};
 
 	enum {
 		KBD_CTRL = 1,
 		KBD_ALT = 2,
-		KBD_SHIFT = 4,
+		KBD_SHIFT = 4
 	};
 
 	enum {
@@ -83,7 +83,7 @@ public:
 	
 	enum {
 		SOUND_8BIT = 0,
-		SOUND_16BIT = 1,
+		SOUND_16BIT = 1
 	};
 	
 	// Set colors of the palette
diff --git a/scumm/boxes.h b/scumm/boxes.h
index cc04d2398d..32d56c73a6 100644
--- a/scumm/boxes.h
+++ b/scumm/boxes.h
@@ -30,7 +30,7 @@ typedef enum {
 	kBoxYFlip		= 0x10,
 	kBoxPlayerOnly	= 0x20,
 	kBoxLocked		= 0x40,
-	kBoxInvisible	= 0x80,
+	kBoxInvisible	= 0x80
 } BoxFlags;
 
 struct AdjustBoxResult {	/* Result type of AdjustBox functions */
diff --git a/scumm/sound.h b/scumm/sound.h
index 64904baf8d..78182f2c2b 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -34,8 +34,7 @@ private:
 
 enum {
 	SOUND_HEADER_SIZE = 26,
-	SOUND_HEADER_BIG_SIZE = 26 + 8,
-
+	SOUND_HEADER_BIG_SIZE = 26 + 8
 };
 
 	int16 _soundQuePos, _soundQue[0x100];
diff --git a/sound/mididrv.h b/sound/mididrv.h
index a4373ff3b3..9520e99e62 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -37,12 +37,12 @@ public:
 		MERR_CANNOT_CONNECT = 1,
 //		MERR_STREAMING_NOT_AVAILABLE = 2,
 		MERR_DEVICE_NOT_AVAILABLE = 3,
-		MERR_ALREADY_OPEN = 4,
+		MERR_ALREADY_OPEN = 4
 	};
 
 	enum {
 		PROP_TIMEDIV = 1,
-		PROP_SMALLHEADER = 2,
+		PROP_SMALLHEADER = 2
 	};
 
 
diff --git a/sound/mixer.h b/sound/mixer.h
index 599ce2e21f..c4c7733881 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -174,7 +174,7 @@ public:
 	bool _paused;
 
 	enum {
-		NUM_CHANNELS = 16,
+		NUM_CHANNELS = 16
 	};
 
 	void * _premixParam;
@@ -193,16 +193,16 @@ public:
 	void unInsert(Channel * chan);
 	void beginSlots(int index);
 
-	/* start playing a raw sound */
+	// start playing a raw sound
 	enum {
-		/* Do *NOT* change any of these flags without looking at the code in mixer.cpp */
-		FLAG_UNSIGNED = 1,					/* unsigned samples */
-		FLAG_STEREO = 2,						/* sound is in stereo */
-		FLAG_16BITS = 4,						/* sound is 16 bits wide */
-		FLAG_AUTOFREE = 8,					/* sound buffer is freed automagically at the end of playing */
-		FLAG_FILE = 16,							/* sound is a FILE * that's read from */
-		FLAG_REVERSE_STEREO = 32,		/* sound should be reverse stereo */
-		FLAG_LOOP = 64,				/* loop the audio */
+		// Do *NOT* change any of these flags without looking at the code in mixer.cpp
+		FLAG_UNSIGNED = 1,          // unsigned samples
+		FLAG_STEREO = 2,            // sound is in stereo
+		FLAG_16BITS = 4,            // sound is 16 bits wide
+		FLAG_AUTOFREE = 8,          // sound buffer is freed automagically at the end of playing
+		FLAG_FILE = 16,             // sound is a FILE * that's read from
+		FLAG_REVERSE_STEREO = 32,   // sound should be reverse stereo
+		FLAG_LOOP = 64              // loop the audio
 	};
 	int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags);
 	int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags, int id);