diff --git a/sc2/src/sc2code/libs/graphics/sdl/pure.c b/sc2/src/sc2code/libs/graphics/sdl/pure.c
index c5dd1bedd..ea7efef52 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/pure.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/pure.c
@@ -347,7 +347,6 @@ TFB_Pure_SwapBuffers (int force_full_redraw)
 void
 Scale_PerfTest (void)
 {
-	int fps = 0;
 	DWORD TimeStart, TimeIn, Now;
 	SDL_Rect updated = {0, 0, ScreenWidth, ScreenHeight};
 	int i;
@@ -378,12 +377,13 @@ Scale_PerfTest (void)
 		if (i % 100 == 0)
 		{
 			Now = SDL_GetTicks ();
-			fprintf(stderr, "%03d(%04d) ", 100*1000 / (Now - TimeIn), Now - TimeIn);
+			fprintf(stderr, "%03ld(%04ld) ", 100*1000 / (Now - TimeIn),
+					Now - TimeIn);
 			TimeIn = Now;
 		}
 	}
 
-	fprintf (stderr, "Full frames scaled: %d; over %d ms; %d fps\n",
+	fprintf (stderr, "Full frames scaled: %d; over %ld ms; %ld fps\n",
 			(i - 1), Now - TimeStart, i * 1000 / (Now - TimeStart));
 
 	SDL_UnlockSurface (scaled_display);
diff --git a/sc2/src/sc2code/libs/graphics/sdl/scalers.c b/sc2/src/sc2code/libs/graphics/sdl/scalers.c
index 77f148b2d..6236bdcb1 100755
--- a/sc2/src/sc2code/libs/graphics/sdl/scalers.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/scalers.c
@@ -180,7 +180,7 @@ typedef struct
 } Scale_PlatDef_t;
 
 
-const static Scale_PlatDef_t
+static const Scale_PlatDef_t
 Scale_PlatDefs[] =
 {
 #if defined(MMX_ASM)