[Scummvm-git-logs] scummvm master -> 23e3a672b051f1a84101b0665841ec47027755ce

[ccawley2011]

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:
23e3a672b0 DS: Fix compilation with C++11 enabled


Commit: 23e3a672b051f1a84101b0665841ec47027755ce
    https://github.com/scummvm/scummvm/commit/23e3a672b051f1a84101b0665841ec47027755ce
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-29T20:05:02+01:00

Commit Message:
DS: Fix compilation with C++11 enabled

Changed paths:
    backends/platform/ds/arm9/source/dsmain.cpp
    backends/platform/ds/arm9/source/portdefs.h
    base/test_new_standards.cpp


diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 14719b0fb2..68cd3a24a7 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -3249,6 +3249,6 @@ extern "C" void consolePrintf(char * format, ...) __attribute__ ((no_instrument_
 extern "C" void consolePrintf(const char * format, ...) {
 	va_list args;
 	va_start(args, format);
-	viprintf(format, args);
+	vprintf(format, args);
 	va_end(args);
 }
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index 0a20c459ab..0325732208 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -26,6 +26,8 @@
 // Include ndstypes.h for uint16 etc. typedefs
 #include "nds/ndstypes.h"
 
+typedef unsigned int uint;
+
 // Define SCUMMVM_DONT_DEFINE_TYPES to prevent scummsys.h from trying to
 // re-define those data types.
 #define SCUMMVM_DONT_DEFINE_TYPES
diff --git a/base/test_new_standards.cpp b/base/test_new_standards.cpp
index e1fa53f04d..ae8652abba 100644
--- a/base/test_new_standards.cpp
+++ b/base/test_new_standards.cpp
@@ -32,6 +32,10 @@
 //
 // Note: there are 3 warnings in my GCC run, they have no signficance
 
+#if defined(NONSTANDARD_PORT)
+#include "portdefs.h"
+#endif
+
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif