From 9c6e217f29bb0a76ec153574a3d493b020e5fb60 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 29 May 2010 08:12:39 +0000 Subject: 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 --- apps/plugins/doom/v_video.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins/doom/v_video.c') diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c index a7e2baea16..76993ea5ee 100644 --- a/apps/plugins/doom/v_video.c +++ b/apps/plugins/doom/v_video.c @@ -208,7 +208,7 @@ void V_MarkRect(int x, int y, int width, int height) // void V_CopyRect(int srcx, int srcy, int srcscrn, int width, int height, int destx, int desty, int destscrn, - enum patch_translation_e flags) + patch_translation_e flags) { byte *src; byte *dest; @@ -263,7 +263,7 @@ void V_CopyRect(int srcx, int srcy, int srcscrn, int width, // implemented, to support highres in the menus // void V_DrawBlock(int x, int y, int scrn, int width, int height, - const byte *src, enum patch_translation_e flags) + const byte *src, patch_translation_e flags) { byte *dest; @@ -406,7 +406,7 @@ void V_Init (void) // means that their inner loops weren't so well optimised, so merging code may even speed them). // void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, - int cm, enum patch_translation_e flags) + int cm, patch_translation_e flags) { const byte *trans; @@ -588,7 +588,7 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, inline #endif void V_DrawNumPatch(int x, int y, int scrn, int lump, - int cm, enum patch_translation_e flags) + int cm, patch_translation_e flags) { V_DrawMemPatch(x, y, scrn, (const patch_t*)W_CacheLumpNum(lump), cm, flags); @@ -634,7 +634,7 @@ int V_NamePatchHeight(const char* name) // patch will be undefined (in fact black for now) byte *V_PatchToBlock(const char* name, int cm, - enum patch_translation_e flags, + patch_translation_e flags, unsigned short* width, unsigned short* height) { (void)cm; -- cgit v1.2.3