commit d6da0b3e4c4dc9a66ff53ccc43739bf584c37efb
author Jack Palevich <jackpal@google.com> Tue Nov 06 21:49:54 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 06 21:49:55 2012 -0800
tree 5e4e114ed3c8550da8c8ed1c7998b438176840a4
parent 7a5374d597eac72560bb5a3f8209438896cfe8a7
parent 10870832a5a2b2d7877538d3ba8ec72b8b9e47a7

Merge "quake: Fix build in ISO C++ 11 mode"

quake/src/WinQuake/common.cpp

diff --git a/quake/src/WinQuake/common.cpp b/quake/src/WinQuake/common.cpp
index d4ea266..7ffc3b0 100644
--- a/quake/src/WinQuake/common.cpp
+++ b/quake/src/WinQuake/common.cpp
@@ -1807,7 +1807,7 @@
 //
 // start up with GAMENAME by default (id1)
 //
-	COM_AddGameDirectory (va("%s/"GAMENAME, basedir) );
+	COM_AddGameDirectory (va("%s/" GAMENAME, basedir) );
 
 	if (COM_CheckParm ("-rogue"))
 		COM_AddGameDirectory (va("%s/rogue", basedir) );

quake/src/WinQuake/host.cpp

diff --git a/quake/src/WinQuake/host.cpp b/quake/src/WinQuake/host.cpp
index f1af56a..4ba1228 100644
--- a/quake/src/WinQuake/host.cpp
+++ b/quake/src/WinQuake/host.cpp
@@ -870,7 +870,7 @@
 	NET_Init ();
 	SV_Init ();
 
-	Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
+	Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
 	Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0));
 	
 	R_InitTextures ();		// needed even for dedicated servers

quake/src/WinQuake/host_cmd.cpp

diff --git a/quake/src/WinQuake/host_cmd.cpp b/quake/src/WinQuake/host_cmd.cpp
index b5964f9..bcf36f8 100644
--- a/quake/src/WinQuake/host_cmd.cpp
+++ b/quake/src/WinQuake/host_cmd.cpp
@@ -956,7 +956,7 @@
 void Host_Version_f (void)
 {
 	Con_Printf ("Version %4.2f\n", VERSION);
-	Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
+	Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
 }
 
 #ifdef IDGODS