[Scummvm-git-logs] scummvm master -> c2a4784706502b21cde005979851f80d65698622

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c2a4784706 SDL: Fix compilation on PSP2


Commit: c2a4784706502b21cde005979851f80d65698622
    https://github.com/scummvm/scummvm/commit/c2a4784706502b21cde005979851f80d65698622
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-12T11:27:45-05:00

Commit Message:
SDL: Fix compilation on PSP2

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 0718c92..39d7e14 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -465,7 +465,7 @@ Common::List<Graphics::PixelFormat> SurfaceSdlGraphicsManager::getSupportedForma
 }
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-static void maskToBitCount(uint32 mask, uint8 &numBits, uint8 &shift) {
+static void maskToBitCount(Uint32 mask, uint8 &numBits, uint8 &shift) {
 	numBits = 0;
 	shift = 32;
 	for (int i = 0; i < 32; ++i) {
@@ -504,7 +504,7 @@ void SurfaceSdlGraphicsManager::detectSupportedFormats() {
 		}
 
 		int bpp;
-		uint32 rMask, gMask, bMask, aMask;
+		Uint32 rMask, gMask, bMask, aMask;
 		if (SDL_PixelFormatEnumToMasks(defaultMode.format, &bpp, &rMask, &gMask, &bMask, &aMask) != SDL_TRUE) {
 			error("Could not convert system pixel format %s to masks", SDL_GetPixelFormatName(defaultMode.format));
 		}