Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed compiler warnings

  • Loading branch information
slouken committed Nov 27, 2012
1 parent a9a03ca commit b3cc4551b19382299e7cabf89a481bc23e7776b2
Showing with 8 additions and 6 deletions.
  1. +2 −0 src/joystick/SDL_gamecontroller.c
  2. +6 −6 test/automated/rwops/rwops.c
@@ -96,7 +96,9 @@ const char *s_ControllerMappings [] =
};

static ControllerMapping_t *s_pSupportedControllers = NULL;
#ifdef SDL_JOYSTICK_DINPUT
static ControllerMapping_t *s_pXInputMapping = NULL;
#endif

/* The SDL game controller structure */
struct _SDL_GameController
@@ -62,13 +62,13 @@ static void rwops_testParam (void)
static int rwops_testGeneric( SDL_RWops *rw, int write )
{
char buf[sizeof(hello_world)];
int i;
Sint64 i;

/* Set to start. */
i = SDL_RWseek( rw, 0, RW_SEEK_SET );
if (SDL_ATvassert( i == 0,
"Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d",
i, 0 ))
(int)i, 0 ))
return 1;

/* Test write. */
@@ -86,14 +86,14 @@ static int rwops_testGeneric( SDL_RWops *rw, int write )
i = SDL_RWseek( rw, 6, RW_SEEK_SET );
if (SDL_ATvassert( i == 6,
"Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d",
i, 0 ))
(int)i, 0 ))
return 1;

/* Test seek. */
i = SDL_RWseek( rw, 0, RW_SEEK_SET );
if (SDL_ATvassert( i == 0,
"Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d",
i, 0 ))
(int)i, 0 ))
return 1;

/* Test read. */
@@ -108,12 +108,12 @@ static int rwops_testGeneric( SDL_RWops *rw, int write )
i = SDL_RWseek( rw, -4, RW_SEEK_CUR );
if (SDL_ATvassert( i == sizeof(hello_world)-5,
"Seeking with SDL_RWseek (RW_SEEK_CUR): got %d, expected %d",
i, sizeof(hello_world)-5 ))
(int)i, sizeof(hello_world)-5 ))
return 1;
i = SDL_RWseek( rw, -1, RW_SEEK_END );
if (SDL_ATvassert( i == sizeof(hello_world)-2,
"Seeking with SDL_RWseek (RW_SEEK_END): got %d, expected %d",
i, sizeof(hello_world)-2 ))
(int)i, sizeof(hello_world)-2 ))
return 1;

return 0;

0 comments on commit b3cc455

Please sign in to comment.