[Orxonox-commit 2410] r7125 - in code/branches/presentation3/src: libraries/util orxonox/overlays

[adrfried at orxonox.net]

Author: adrfried
Date: 2010-06-09 17:34:23 +0200 (Wed, 09 Jun 2010)
New Revision: 7125

Modified:
   code/branches/presentation3/src/libraries/util/Singleton.h
   code/branches/presentation3/src/orxonox/overlays/GUISheet.cc
Log:
fix includes for compiling without PCH

Modified: code/branches/presentation3/src/libraries/util/Singleton.h
===================================================================
--- code/branches/presentation3/src/libraries/util/Singleton.h	2010-06-08 08:27:30 UTC (rev 7124)
+++ code/branches/presentation3/src/libraries/util/Singleton.h	2010-06-09 15:34:23 UTC (rev 7125)
@@ -32,6 +32,10 @@
 #include "UtilPrereqs.h"
 #include <cassert>
 
+#ifndef NULL
+#  define NULL 0
+#endif
+
 namespace orxonox
 {
     /**

Modified: code/branches/presentation3/src/orxonox/overlays/GUISheet.cc
===================================================================
--- code/branches/presentation3/src/orxonox/overlays/GUISheet.cc	2010-06-08 08:27:30 UTC (rev 7124)
+++ code/branches/presentation3/src/orxonox/overlays/GUISheet.cc	2010-06-09 15:34:23 UTC (rev 7125)
@@ -31,6 +31,7 @@
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
+#include "core/GameMode.h"
 
 namespace orxonox
 {