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/SoftwareDriver2_helper.h

@@ -7,8 +7,8 @@
 	- changed behavior for log2 textures ( replaced multiplies by shift )
 */
 
-#ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
-#define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
+#ifndef S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED
+#define S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED
 
 #include "SoftwareDriver2_compile_config.h"
 #include "irrMath.h"
@@ -1241,4 +1241,3 @@ static inline int tiny_isequal(const char *s1, const char *s2, size_t n)
 } // end namespace irr
 
 #endif
-