Merge branch 'master'

6 files changed, 16 insertions, 13 deletions

diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp
index 35cb51f349..4f01531486 100644
--- a/backends/platform/dc/audio.cpp
+++ b/backends/platform/dc/audio.cpp
@@ -59,7 +59,7 @@ void OSystem_Dreamcast::checkSound()
   if (n<100)
     return;
 
-  _mixer->mixCallback((byte*)temp_sound_buffer,
+  _mixer->mixCallback((byte *)temp_sound_buffer,
 		      2*SAMPLES_TO_BYTES(n));
 
   if (fillpos+n > curr_ring_buffer_samples) {
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index f30c9c56d1..36f5a1465c 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -39,7 +39,7 @@ protected:
 	Common::String _path;
 
 public:
-	RoninCDFileNode(const Common::String &path) : _path(path) {};
+	RoninCDFileNode(const Common::String &path) : _path(path) {}
 
 	virtual bool exists() const { return true; }
 	virtual Common::String getName() const { return lastPathComponent(_path, '/'); }
@@ -61,7 +61,7 @@ public:
 /* A directory */
 class RoninCDDirectoryNode : public RoninCDFileNode {
 public:
-	RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {};
+	RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {}
 
 	virtual bool isDirectory() const { return true; }
 	virtual AbstractFSNode *getChild(const Common::String &n) const;
@@ -72,7 +72,7 @@ public:
 /* A file/directory which does not exist */
 class RoninCDNonexistingNode : public RoninCDFileNode {
 public:
-	RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {};
+	RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {}
 
 	virtual bool exists() const { return false; }
 	virtual bool isReadable() const { return false; }
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 2e32ff3eb4..8ca48bf19e 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -29,6 +29,8 @@
 #include "backends/audiocd/default/default-audiocd.h"
 #include "backends/fs/fs-factory.h"
 #include "audio/mixer_intern.h"
+#include "common/language.h"
+#include "common/platform.h"
 #ifdef DYNAMIC_MODULES
 #include "backends/plugins/dynamic-plugin.h"
 #endif
diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp
index 675f7ad8c7..56193c282a 100644
--- a/backends/platform/dc/dcloader.cpp
+++ b/backends/platform/dc/dcloader.cpp
@@ -385,8 +385,8 @@ void *DLObject::symbol(const char *name)
   for (int c = symbol_cnt; c--; s++)
     if ((s->st_info>>4 == 1 || s->st_info>>4 == 2) &&
        strtab[s->st_name] == '_' && !strcmp(name, strtab+s->st_name+1)) {
-      DBG(("=> %p\n", (void*)s->st_value));
-      return (void*)s->st_value;
+      DBG(("=> %p\n", (void *)s->st_value));
+      return (void *)s->st_value;
     }
 
   seterror("Symbol \"%s\" not found.", name);
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index 76658c6590..e886b55869 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -334,8 +334,8 @@ void OSystem_Dreamcast::updateScreenTextures(void)
     unsigned short *dst = (unsigned short *)screen_tx[_screen_buffer];
     unsigned char *src = screen;
 
-    // while ((*((volatile unsigned int *)(void*)0xa05f810c) & 0x3ff) != 200);
-    // *((volatile unsigned int *)(void*)0xa05f8040) = 0xff0000;
+    // while ((*((volatile unsigned int *)(void *)0xa05f810c) & 0x3ff) != 200);
+    // *((volatile unsigned int *)(void *)0xa05f8040) = 0xff0000;
 
     if (_screenFormat == 0)
       for ( int y = 0; y<_screen_h; y++ )
@@ -379,7 +379,7 @@ void OSystem_Dreamcast::updateScreenPolygons(void)
   struct polygon_list mypoly;
   struct packed_colour_vertex_list myvertex;
 
-  // *((volatile unsigned int *)(void*)0xa05f8040) = 0x00ff00;
+  // *((volatile unsigned int *)(void *)0xa05f8040) = 0x00ff00;
 
   mypoly.cmd =
     TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_OPAQUE|TA_CMD_POLYGON_SUBLIST|
@@ -395,7 +395,7 @@ void OSystem_Dreamcast::updateScreenPolygons(void)
   mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
 
   ta_begin_frame();
-  // *((volatile unsigned int *)(void*)0xa05f8040) = 0x0000ff;
+  // *((volatile unsigned int *)(void *)0xa05f8040) = 0x0000ff;
   ta_commit_list(&mypoly);
 
   myvertex.cmd = TA_CMD_VERTEX;
@@ -493,12 +493,12 @@ void OSystem_Dreamcast::updateScreenPolygons(void)
     _softkbd.draw(330.0*sin(0.013*_softkbd_motion) - 320.0, 200.0,
 		  120-_softkbd_motion);
 
-  // *((volatile unsigned int *)(void*)0xa05f8040) = 0xffff00;
+  // *((volatile unsigned int *)(void *)0xa05f8040) = 0xffff00;
   drawMouse(_ms_cur_x, _ms_cur_y, _ms_cur_w, _ms_cur_h, _ms_buf, _ms_visible);
-  // *((volatile unsigned int *)(void*)0xa05f8040) = 0xff00ff;
+  // *((volatile unsigned int *)(void *)0xa05f8040) = 0xff00ff;
   ta_commit_frame();
 
-  // *((volatile unsigned int *)(void*)0xa05f8040) = 0x0;
+  // *((volatile unsigned int *)(void *)0xa05f8040) = 0x0;
 
   _last_screen_refresh = Timer();
 }
diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h
index ca2b5208a3..1f5c8f566a 100644
--- a/backends/platform/dc/portdefs.h
+++ b/backends/platform/dc/portdefs.h
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <math.h>
+#include <new>
 #ifndef RONIN_TIMER_ACCESS
 #define Timer ronin_Timer
 #endif