Fix several compilation warnings.

src/OpenGL/libEGL/Image.hpp

@@ -28,8 +28,8 @@ class Image : public sw::Surface
 {
 public:
 	Image(sw::Resource *resource, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, sw::Format internalFormat)
-		: width(width), height(height), format(format), type(type), internalFormat(internalFormat), depth(depth)
-		, sw::Surface(resource, width, height, depth, internalFormat, true, true)
+		: sw::Surface(resource, width, height, depth, internalFormat, true, true),
+		  width(width), height(height), format(format), type(type), internalFormat(internalFormat), depth(depth)
 	{
 		shared = false;
 
@@ -40,8 +40,8 @@ public:
 	}
 
 	Image(sw::Resource *resource, int width, int height, int depth, sw::Format internalFormat, bool lockable, bool renderTarget)
-		: width(width), height(height), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), internalFormat(internalFormat), depth(depth)
-		, sw::Surface(resource, width, height, depth, internalFormat, lockable, renderTarget)
+		: sw::Surface(resource, width, height, depth, internalFormat, lockable, renderTarget),
+		  width(width), height(height), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), internalFormat(internalFormat), depth(depth)
 	{
 		shared = false;
 

src/OpenGL/libEGL/libEGL.cpp

@@ -490,7 +490,7 @@ EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLi
 	case EGL_SWAP_BEHAVIOR:
 		if(value == EGL_BUFFER_PRESERVED)
 		{
-			if(!(eglSurface->getSurfaceType() && EGL_SWAP_BEHAVIOR_PRESERVED_BIT))
+			if(!(eglSurface->getSurfaceType() & EGL_SWAP_BEHAVIOR_PRESERVED_BIT))
 			{
 				return error(EGL_BAD_MATCH, EGL_FALSE);
 			}

src/OpenGL/libGLES_CM/libGLES_CM.hpp

@@ -92,4 +92,4 @@ private:
 	LibGLES_CMexports *libGLES_CMexports;
 };
 
-#endif libGLES_CM_hpp
+#endif   // libGLES_CM_hpp

src/Renderer/TextureStage.hpp

@@ -193,4 +193,4 @@ namespace sw
 	};
 }
 
-#endif sw_TextureStage_hpp
+#endif  // sw_TextureStage_hpp