diff --git a/glide2x/cvg/glide/src/g3df.c b/glide2x/cvg/glide/src/g3df.c index 35e46c4..22163c2 100644 --- a/glide2x/cvg/glide/src/g3df.c +++ b/glide2x/cvg/glide/src/g3df.c @@ -83,9 +83,9 @@ static void Read8Bit(FxU8 *dst, FILE *image, int small_lod, int large_lod, GrAs static void Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide2x/cvg/glide/src/gglide.c b/glide2x/cvg/glide/src/gglide.c index 52af080..c737f01 100644 --- a/glide2x/cvg/glide/src/gglide.c +++ b/glide2x/cvg/glide/src/gglide.c @@ -171,9 +171,6 @@ #include "fxglide.h" #include "fxinline.h" -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - #if GLIDE_HW_TRI_SETUP static void _grUpdateTriPacketHdr(FxU32 paramMask, @@ -197,9 +194,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, GDBG_INFO_MORE(gc->myLevel, "(%d,%d,%d,%d)\n", rgb_sf, rgb_df, alpha_sf, alpha_df); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.fbi_config.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide2x/h3/glide/src/g3df.c b/glide2x/h3/glide/src/g3df.c index 7d14cf6..0607cad 100644 --- a/glide2x/h3/glide/src/g3df.c +++ b/glide2x/h3/glide/src/g3df.c @@ -83,9 +83,9 @@ static void Read8Bit(FxU8 *dst, FILE *image, int small_lod, int large_lod, GrAs static void Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide2x/h3/glide/src/gglide.c b/glide2x/h3/glide/src/gglide.c index 6f135cd..97d8796 100644 --- a/glide2x/h3/glide/src/gglide.c +++ b/glide2x/h3/glide/src/gglide.c @@ -302,9 +302,6 @@ #include "fxglide.h" #include "fxinline.h" -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - #if GLIDE_HW_TRI_SETUP static void _grUpdateTriPacketHdr(FxU32 paramMask, @@ -328,9 +325,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, GDBG_INFO_MORE(gc->myLevel, "(%d,%d,%d,%d)\n", rgb_sf, rgb_df, alpha_sf, alpha_df); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.fbi_config.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide2x/sst1/glide/src/g3df.c b/glide2x/sst1/glide/src/g3df.c index b97a309..d3f8562 100644 --- a/glide2x/sst1/glide/src/g3df.c +++ b/glide2x/sst1/glide/src/g3df.c @@ -50,9 +50,9 @@ static void Read8Bit( FxU8 *dst, FILE *image, int small_lod, int large_lod, GrA static void Read16Bit( FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect ); #if ( ( GLIDE_PLATFORM & ( GLIDE_OS_DOS32 | GLIDE_OS_WIN32 ) ) != 0 ) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide2x/sst1/glide/src/gglide.c b/glide2x/sst1/glide/src/gglide.c index caa1051..554b30a 100644 --- a/glide2x/sst1/glide/src/gglide.c +++ b/glide2x/sst1/glide/src/gglide.c @@ -189,9 +189,6 @@ #include #endif -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - /*--------------------------------------------------------------------------- ** grAlphaBlendFunction ** @@ -206,9 +203,6 @@ GR_ENTRY(grAlphaBlendFunction, void, ( GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendF GR_BEGIN("grAlphaBlendFunction",85,4); GDBG_INFO_MORE((gc->myLevel,"(%d,%d,%d,%d)\n",rgb_sf,rgb_df,alpha_sf,alpha_df)); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.fbi_config.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { // GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide2x/sst1/glide/src/gpci.c b/glide2x/sst1/glide/src/gpci.c index e685cb7..aafbf46 100644 --- a/glide2x/sst1/glide/src/gpci.c +++ b/glide2x/sst1/glide/src/gpci.c @@ -843,7 +843,7 @@ _GR_SET16(void *addr, unsigned short data) #if defined( GLIDE_DEBUG ) && ( GLIDE_PLATFORM & GLIDE_HW_SST96 ) -extern char *regNames[]; +extern const char *regNames[]; static FxU32 thisMask; static FxU32 thisWrite; diff --git a/glide2x/sst1/glide/src/sst96.c b/glide2x/sst1/glide/src/sst96.c index 5207146..b9d92a6 100644 --- a/glide2x/sst1/glide/src/sst96.c +++ b/glide2x/sst1/glide/src/sst96.c @@ -97,7 +97,7 @@ #define GEN_INDEX(a) ((((FxU32) a) - ((FxU32) gc->reg_ptr)) >> 2) -char +const char *regNames[] = { "status", /* 0x00 */ "reserved001", /* 0x01 */ diff --git a/glide3x/cvg/glide3/src/diget.c b/glide3x/cvg/glide3/src/diget.c index 4ce8451..0e4c3c4 100644 --- a/glide3x/cvg/glide3/src/diget.c +++ b/glide3x/cvg/glide3/src/diget.c @@ -163,7 +163,7 @@ #include "fxinline.h" -const FxU32 _grMemOffset[16] = +static const FxU32 _grMemOffset[16] = { 35, /* 320x200 */ 40, /* 320x240 */ @@ -183,7 +183,7 @@ const FxU32 _grMemOffset[16] = 70 /* 400x300 */ }; -const FxU32 _grResolutionRefresh[16][9] = +static const FxU32 _grResolutionRefresh[16][9] = { { /* 320x200 */ 0, /* 60 Hz */ diff --git a/glide3x/cvg/glide3/src/g3df.c b/glide3x/cvg/glide3/src/g3df.c index cc45d58..17aff4f 100644 --- a/glide3x/cvg/glide3/src/g3df.c +++ b/glide3x/cvg/glide3/src/g3df.c @@ -105,9 +105,9 @@ static FxBool Read8Bit(FxU8 *dst, FILE *image, int small_lod, int large_lod, GrA static FxBool Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide3x/cvg/glide3/src/gglide.c b/glide3x/cvg/glide3/src/gglide.c index 0a9d3cf..7a36acc 100644 --- a/glide3x/cvg/glide3/src/gglide.c +++ b/glide3x/cvg/glide3/src/gglide.c @@ -347,9 +347,6 @@ #include "fxglide.h" #include "fxinline.h" -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - #if GLIDE_HW_TRI_SETUP static void _grUpdateTriPacketHdr(FxU32 paramMask, @@ -373,9 +370,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, GDBG_INFO_MORE(gc->myLevel, "(%d,%d,%d,%d)\n", rgb_sf, rgb_df, alpha_sf, alpha_df); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.fbi_config.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide3x/cvg/glide3/src/gu.c b/glide3x/cvg/glide3/src/gu.c index 277a7d6..a70c426 100644 --- a/glide3x/cvg/glide3/src/gu.c +++ b/glide3x/cvg/glide3/src/gu.c @@ -72,7 +72,7 @@ #include "fxinline.h" -const FxU32 _grResolutionXY[16][2] = +static const FxU32 _grResolutionXY[16][2] = { { 320, 200 }, /* 320x200 */ { 320, 240 }, /* 320x240 */ diff --git a/glide3x/h3/glide3/src/g3df.c b/glide3x/h3/glide3/src/g3df.c index 9d23ab1..e18b608 100644 --- a/glide3x/h3/glide3/src/g3df.c +++ b/glide3x/h3/glide3/src/g3df.c @@ -110,9 +110,9 @@ static FxBool Read8Bit(FxU8 *dst, FILE *image, int small_lod, int large_lod, GrA static FxBool Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide3x/h3/glide3/src/gglide.c b/glide3x/h3/glide3/src/gglide.c index 4a3722d..87fff0e 100644 --- a/glide3x/h3/glide3/src/gglide.c +++ b/glide3x/h3/glide3/src/gglide.c @@ -456,9 +456,6 @@ #include #endif -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - #if GLIDE_HW_TRI_SETUP static void _grUpdateTriPacketHdr(FxU32 paramMask, @@ -482,9 +479,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, GDBG_INFO_MORE(gc->myLevel, "(%d,%d,%d,%d)\n", rgb_sf, rgb_df, alpha_sf, alpha_df); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.shadow.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide3x/h5/glide3/src/g3df.c b/glide3x/h5/glide3/src/g3df.c index 7c91c97..2277358 100644 --- a/glide3x/h5/glide3/src/g3df.c +++ b/glide3x/h5/glide3/src/g3df.c @@ -132,9 +132,9 @@ static FxBool Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, G static FxBool Read32Bit(FxU32 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide3x/h5/glide3/src/gglide.c b/glide3x/h5/glide3/src/gglide.c index 34e38ca..6fdd934 100644 --- a/glide3x/h5/glide3/src/gglide.c +++ b/glide3x/h5/glide3/src/gglide.c @@ -654,9 +654,6 @@ #include #endif -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - #if GLIDE_HW_TRI_SETUP static void _grUpdateTriPacketHdr(FxU32 paramMask, @@ -681,9 +678,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, GDBG_INFO_MORE(gc->myLevel, "(%d,%d,%d,%d)\n", rgb_sf, rgb_df, alpha_sf, alpha_df); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.shadow.alphaMode; if (gc->grPixelSize == 4) { switch (alpha_sf) { diff --git a/glide3x/sst1/glide3/src/diget.c b/glide3x/sst1/glide3/src/diget.c index 22451f1..a789ccb 100644 --- a/glide3x/sst1/glide3/src/diget.c +++ b/glide3x/sst1/glide3/src/diget.c @@ -175,7 +175,7 @@ #include "fxinline.h" -const FxU32 _grMemOffset[16] = +static const FxU32 _grMemOffset[16] = { 65536, /* 320x200 */ 65536, /* 320x240 */ @@ -195,7 +195,7 @@ const FxU32 _grMemOffset[16] = 65536 /* 400x300 */ }; -const FxU32 _grResolutionRefresh[16][9] = +static const FxU32 _grResolutionRefresh[16][9] = { { /* 320x200 */ 0, /* 60 Hz */ diff --git a/glide3x/sst1/glide3/src/g3df.c b/glide3x/sst1/glide3/src/g3df.c index b1fe9b4..eeb1afd 100644 --- a/glide3x/sst1/glide3/src/g3df.c +++ b/glide3x/sst1/glide3/src/g3df.c @@ -106,9 +106,9 @@ static FxBool Read8Bit(FxU8 *dst, FILE *image, int small_lod, int large_lod, GrA static FxBool Read16Bit(FxU16 *dst, FILE *image, int small_lod, int large_lod, GrAspectRatio_t aspect); #if ((GLIDE_PLATFORM & (GLIDE_OS_DOS32 | GLIDE_OS_WIN32 | GLIDE_OS_MACOS)) != 0) -const char *openmode = "rb"; +static const char *openmode = "rb"; #else -const char *openmode = "r"; +static const char *openmode = "r"; #endif typedef struct diff --git a/glide3x/sst1/glide3/src/gglide.c b/glide3x/sst1/glide3/src/gglide.c index 9afedb6..6c36c65 100644 --- a/glide3x/sst1/glide3/src/gglide.c +++ b/glide3x/sst1/glide3/src/gglide.c @@ -210,9 +210,6 @@ #include #endif -#include "rcver.h" -static char glideIdent[] = "@#%" VERSIONSTR ; - /*--------------------------------------------------------------------------- ** grAlphaBlendFunction ** @@ -227,9 +224,6 @@ GR_STATE_ENTRY(grAlphaBlendFunction, void, ( GrAlphaBlendFnc_t rgb_sf, GrAlpha GR_BEGIN_NOFIFOCHECK("grAlphaBlendFunction",85); GDBG_INFO_MORE((gc->myLevel,"(%d,%d,%d,%d)\n",rgb_sf,rgb_df,alpha_sf,alpha_df)); - /* Watcom warning suppressor */ - glideIdent[0] = glideIdent[0]; - alphamode = gc->state.fbi_config.alphaMode; if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) { // GR_CHECK_W(myName, 1, "unsupported alpha source blend function"); diff --git a/glide3x/sst1/glide3/src/gpci.c b/glide3x/sst1/glide3/src/gpci.c index 9567cbc..68c4dad 100644 --- a/glide3x/sst1/glide3/src/gpci.c +++ b/glide3x/sst1/glide3/src/gpci.c @@ -899,7 +899,7 @@ _GR_SET16(void *addr, unsigned short data) #if defined( GLIDE_DEBUG ) && ( GLIDE_PLATFORM & GLIDE_HW_SST96 ) -extern char *regNames[]; +extern const char *regNames[]; static FxU32 thisMask; static FxU32 thisWrite; diff --git a/glide3x/sst1/glide3/src/gu.c b/glide3x/sst1/glide3/src/gu.c index e85e8e8..6946d50 100644 --- a/glide3x/sst1/glide3/src/gu.c +++ b/glide3x/sst1/glide3/src/gu.c @@ -55,7 +55,7 @@ #include #endif -const FxU32 _grResolutionXY[16][2] = +static const FxU32 _grResolutionXY[16][2] = { { 320, 200 }, /* 320x200 */ { 320, 240 }, /* 320x240 */ diff --git a/glide3x/sst1/glide3/src/sst96.c b/glide3x/sst1/glide3/src/sst96.c index 7e58c08..e2d58bb 100644 --- a/glide3x/sst1/glide3/src/sst96.c +++ b/glide3x/sst1/glide3/src/sst96.c @@ -104,7 +104,7 @@ #define GEN_INDEX(a) ((((FxU32) a) - ((FxU32) gc->reg_ptr)) >> 2) -char +const char *regNames[] = { "status", /* 0x00 */ "reserved001", /* 0x01 */