Doom plugin: In anticipation of moving to the EABI toolchain, because of its assumptions about enums being sized as ints, convert enum typdefs to int or unsigned depending upon whether they have negative values in the enumeration. This should effectively preserve the manner in which it is compiled under the old toolchain and avoids having to closely inspect and possibly change many places in the code.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26368 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 4 deletions

diff --git a/apps/plugins/doom/sounds.h b/apps/plugins/doom/sounds.h
index bf1004cda9..a5f6fc53ee 100644
--- a/apps/plugins/doom/sounds.h
+++ b/apps/plugins/doom/sounds.h
@@ -102,7 +102,7 @@ extern musicinfo_t  S_music[];
 // Identifiers for all music in game.
 //
 
-typedef enum {
+enum {
    mus_None,
    mus_e1m1,
    mus_e1m2,
@@ -172,13 +172,14 @@ typedef enum {
    mus_dm2ttl,
    mus_dm2int,
    NUMMUSIC
-} musicenum_t;
+};
+typedef unsigned musicenum_t;
 
 //
 // Identifiers for all sfx in game.
 //
 
-typedef enum {
+enum {
    sfx_None,
    sfx_pistol,
    sfx_shotgn,
@@ -299,6 +300,7 @@ typedef enum {
 #endif
 
    NUMSFX
-} sfxenum_t;
+};
+typedef unsigned sfxenum_t;
 
 #endif