--- a/src/joystick/SDL_gamecontroller.c	Tue Nov 27 00:58:12 2012 -0800
+++ b/src/joystick/SDL_gamecontroller.c	Tue Nov 27 01:07:44 2012 -0800
@@ -96,7 +96,9 @@
 };
 
 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

--- a/test/automated/rwops/rwops.c	Tue Nov 27 00:58:12 2012 -0800
+++ b/test/automated/rwops/rwops.c	Tue Nov 27 01:07:44 2012 -0800
@@ -62,13 +62,13 @@
 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 @@
    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 @@
    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;