[Scummvm-git-logs] scummvm master -> 3d83d144a361aee1bbaff00850f2efcd21683954

[ccawley2011]

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

Summary:
5589c2bd60 ANDROID: Fix warning
3d83d144a3 OPENGL: Fix warning when using builtin OpenGL functions


Commit: 5589c2bd605e8a80508b8a1d26948cc75762aa85
    https://github.com/scummvm/scummvm/commit/5589c2bd605e8a80508b8a1d26948cc75762aa85
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-10-18T16:48:18+01:00

Commit Message:
ANDROID: Fix warning

Changed paths:
    backends/platform/android/android.cpp


diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 59a3c5a..7d5bce9 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -55,6 +55,7 @@
 #include "common/events.h"
 #include "common/config-manager.h"
 
+#include "backends/audiocd/default/default-audiocd.h"
 #include "backends/keymapper/keymapper.h"
 #include "backends/mutex/pthread/pthread-mutex.h"
 #include "backends/saves/default/default-saves.h"


Commit: 3d83d144a361aee1bbaff00850f2efcd21683954
    https://github.com/scummvm/scummvm/commit/3d83d144a361aee1bbaff00850f2efcd21683954
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-10-18T16:49:12+01:00

Commit Message:
OPENGL: Fix warning when using builtin OpenGL functions

Changed paths:
    backends/graphics/opengl/context.cpp


diff --git a/backends/graphics/opengl/context.cpp b/backends/graphics/opengl/context.cpp
index 08f4496..564007b 100644
--- a/backends/graphics/opengl/context.cpp
+++ b/backends/graphics/opengl/context.cpp
@@ -82,11 +82,11 @@ void OpenGLGraphicsManager::initializeGLContext() {
 	// We use horrible trickery to silence C++ compilers.
 	// See backends/plugins/sdl/sdl-provider.cpp for more information.
 	assert(sizeof(void (*)()) == sizeof(void *));
-	void *fn = nullptr;
 
-#define LOAD_FUNC(name, loadName) \
-	fn = getProcAddress(#loadName); \
-	memcpy(&g_context.name, &fn, sizeof(fn))
+#define LOAD_FUNC(name, loadName) { \
+	void *fn = getProcAddress(#loadName); \
+	memcpy(&g_context.name, &fn, sizeof(fn)); \
+}
 
 #define GL_EXT_FUNC_DEF(ret, name, param) LOAD_FUNC(name, name)