Skip to content
Permalink
Browse files

Fix more compilation warnings

  • Loading branch information
pmandin committed Aug 28, 2011
1 parent 95fc137 commit 397402ff59882180470923c909e2de08d2834257
@@ -59,7 +59,7 @@

/*--- Static variables ---*/

static unsigned long cookie_snd, cookie_mch;
static long cookie_snd, cookie_mch;
static cookie_stfa_t *cookie_stfa;

static const int freqs[16]={
@@ -84,7 +84,7 @@ static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec);

static int Audio_Available(void)
{
unsigned long dummy;
long dummy;
const char *envr = SDL_getenv("SDL_AUDIODRIVER");

/* Check if user asked a different audio driver */
@@ -62,7 +62,7 @@

/*--- Static variables ---*/

static unsigned long cookie_snd;
static long cookie_snd;

/*--- Audio driver functions ---*/

@@ -265,14 +265,10 @@ static void Mint_CheckExternalClock(_THIS)
{
#define SIZE_BUF_CLOCK_MEASURE (44100/10)

unsigned long cookie_snd;
char *buffer;
int i, j;

/* DSP present with its GPIO port ? */
if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) {
return;
}
if ((cookie_snd & SND_DSP)==0) {
return;
}
@@ -49,7 +49,7 @@
#define MAX_DRIVES 32

typedef struct {
unsigned char device[3]; /* Physical device letter + ':' + '\0' */
char device[3]; /* Physical device letter + ':' + '\0' */
metaopen_t metaopen; /* Infos on opened drive */
} metados_drive_t;

@@ -206,7 +206,7 @@ static const Uint32 teamtap_ghosts[20][4]={

typedef struct {
SDL_bool enabled;
unsigned char *name;
char *name;
Uint32 prevstate;
} atarijoy_t;

@@ -264,7 +264,7 @@ static void UpdateJoypads(void);
int SDL_SYS_JoystickInit(void)
{
int i;
unsigned long cookie_mch;
long cookie_mch;
const char *envr=SDL_getenv("SDL_JOYSTICK_ATARI");

#define TEST_JOY_ENABLED(env,idstring,num) \
@@ -59,7 +59,7 @@ static int mint_present; /* can we use Syield() ? */
void SDL_StartTicks(void)
{
void *old_stack;
unsigned long dummy;
long dummy;

/* Set first ticks value */
old_stack = (void *)Super(0);
@@ -52,14 +52,14 @@ enum {

/* The translation tables from a console scancode to a SDL keysym */
static SDLKey keymap[ATARIBIOS_MAXKEYS];
static unsigned char *keytab_normal;
static char *keytab_normal;

void (*Atari_ShutdownEvents)(void);

static void Atari_InitializeEvents(_THIS)
{
const char *envr;
unsigned long cookie_mch;
long cookie_mch;

/* Test if we are on an Atari machine or not */
if (Getcookie(C__MCH, &cookie_mch) == C_NOTFOUND) {
@@ -73,7 +73,7 @@ static unsigned char vdi_index[256] = {
9, 10, 11, 14, 12, 15, 13, 255
};

static const unsigned char empty_name[]="";
static const char empty_name[]="";

/* Initialization/Query functions */
static int GEM_VideoInit(_THIS, SDL_PixelFormat *vformat);
@@ -216,7 +216,7 @@ VideoBootStrap GEM_bootstrap = {
static void VDI_ReadExtInfo(_THIS, short *work_out)
{
unsigned long EdDI_version;
unsigned long cookie_EdDI;
long cookie_EdDI;
Uint32 num_colours;
Uint16 clut_type, num_bits;

@@ -138,8 +138,8 @@ static const xbiosmode_t falconvgamodes[6]={

static int XBIOS_Available(void)
{
unsigned long cookie_vdo, /*cookie_mil,*/ cookie_hade, cookie_scpn;
unsigned long cookie_fvdi;
long cookie_vdo, /*cookie_mil,*/ cookie_hade, cookie_scpn;
long cookie_fvdi;
const char *envr = SDL_getenv("SDL_VIDEODRIVER");

/* Milan/Hades Atari clones do not have an Atari video chip */
@@ -362,7 +362,7 @@ static void XBIOS_ListFalconVgaModes(_THIS, int actually_add)
static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
{
int i;
unsigned long cookie_blow, cookie_scpn, cookie_cnts;
long cookie_blow, cookie_scpn, cookie_cnts;

/* Initialize all variables that we clean on shutdown */
for ( i=0; i<NUM_MODELISTS; ++i ) {
@@ -37,7 +37,7 @@ static int status;

int SDL_XBIOS_TveillePresent(_THIS)
{
unsigned long dummy;
long dummy;

cookie_veil = NULL;
if (Getcookie(C_VeiL, &dummy) == C_FOUND) {

0 comments on commit 397402f

Please sign in to comment.