Merging r6250 through r6254 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CFPSCounter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_FPSCOUNTER_H_INCLUDED__
-#define __C_FPSCOUNTER_H_INCLUDED__
+#ifndef IRR_C_FPSCOUNTER_H_INCLUDED
+#define IRR_C_FPSCOUNTER_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -49,6 +49,4 @@ private:
 } // end namespace video
 } // end namespace irr
 
-
 #endif
-