diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
index 6462aa8a..84906fdf 100644
--- a/src/gui/sdl_mapper.cpp
+++ b/src/gui/sdl_mapper.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: sdl_mapper.cpp,v 1.45 2007-10-28 16:36:41 qbix79 Exp $ */
+/* $Id: sdl_mapper.cpp,v 1.46 2007-10-31 11:43:06 qbix79 Exp $ */
 
 #include <vector>
 #include <list>
@@ -1217,7 +1217,7 @@ protected:
 	Bit16u button_state;
 };
 
-static struct {
+static struct CMapper {
 	SDL_Surface * surface;
 	SDL_Surface * draw_surface;
 	bool exit;
diff --git a/src/misc/support.cpp b/src/misc/support.cpp
index cdb3ee27..f51ad77b 100644
--- a/src/misc/support.cpp
+++ b/src/misc/support.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: support.cpp,v 1.32 2007-06-12 20:22:09 c2woody Exp $ */
+/* $Id: support.cpp,v 1.33 2007-10-31 11:45:14 qbix79 Exp $ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -102,7 +102,7 @@ char * StripWord(char *&line) {
 		}
 	}
 	char * begin=scan;
-	for (;char c=*scan;scan++) {
+	for (char c = *scan ;(c = *scan);scan++) {
 		if (isspace(*reinterpret_cast<unsigned char*>(&c))) {
 			*scan++=0;
 			break;