use __ prefix on header guards to avoid mixing up defines with api functions / classes.

11 files changed, 32 insertions, 32 deletions

diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index a9d7ab1b93f..e865c662eda 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPC_CANVAS_H_
-#define _GPC_CANVAS_H_
+#ifndef __GPC_CANVAS_H__
+#define __GPC_CANVAS_H__
 
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
@@ -270,5 +270,5 @@ protected:
 	static TBannerId s_bannerId;
 };
 
-#endif // _GPC_CANVAS_H_
+#endif // __GPC_CANVAS_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h
index 70e5a3ee631..095efee7895 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.h
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_ENGINE_H
-#define __GPC_ENGINE_H
+#ifndef __GPC_ENGINE_H__
+#define __GPC_ENGINE_H__
 
 #include "GPC_Canvas.h"
 #include "GPC_System.h"
@@ -121,5 +121,5 @@ private:
 
 };
 
-#endif  // __GPC_ENGINE_H
+#endif  // __GPC_ENGINE_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
index 3d88dc467b0..ba4213b190c 100644
--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_KEYBOARDDEVICE_H
-#define __GPC_KEYBOARDDEVICE_H
+#ifndef __GPC_KEYBOARDDEVICE_H__
+#define __GPC_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
index a4f0032df1d..c5576d1d234 100644
--- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_MOUSE_DEVICE_H
-#define __GPC_MOUSE_DEVICE_H
+#ifndef __GPC_MOUSEDEVICE_H__
+#define __GPC_MOUSEDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -102,5 +102,5 @@ protected:
 	virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval);
 };
 
-#endif  // __GPC_MOUSE_DEVICE_H
+#endif  // __GPC_MOUSEDEVICE_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
index 9b27ba3f009..6f15276ab83 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
@@ -29,10 +29,10 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOADDOTBLENDARRAY_H
-#define __GPC_RAWLOADDOTBLENDARRAY_H
+#ifndef __GPC_RAWLOADDOTBLENDARRAY_H__
+#define __GPC_RAWLOADDOTBLENDARRAY_H__
 
 void GetRawLoadingAnimation(unsigned char **data, int *dataSize);
 
-#endif  // __GPC_RAWLOADDOTBLENDARRAY_H
+#endif  // __GPC_RAWLOADDOTBLENDARRAY_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
index 43bd6d22190..ade00020353 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOGOARRAYS_H
-#define __GPC_RAWLOGOARRAYS_H
+#ifndef __GPC_RAWLOGOARRAYS_H__
+#define __GPC_RAWLOGOARRAYS_H__
 
 void GetRawBlenderLogo(unsigned char **data, int *width, int *height);
 void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
@@ -38,5 +38,5 @@ void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
 void GetRawNaNLogo(unsigned char **data, int *width, int *height);
 #endif
 
-#endif  // __GPC_RAWLOGOARRAYS_H
+#endif  // __GPC_RAWLOGOARRAYS_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index e3c69029700..54bf45fc74b 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RENDERTOOLS_H
-#define __GPC_RENDERTOOLS_H
+#ifndef __GPC_RENDERTOOLS_H__
+#define __GPC_RENDERTOOLS_H__
 
 #ifdef WIN32
 // don't show stl-warnings
@@ -106,7 +106,7 @@ public:
 	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
-#endif  // __GPC_RENDERTOOLS_H
+#endif  // __GPC_RENDERTOOLS_H__
 
 
 
diff --git a/source/gameengine/GamePlayer/common/GPC_System.h b/source/gameengine/GamePlayer/common/GPC_System.h
index 9f7a56aa783..03bb7743637 100644
--- a/source/gameengine/GamePlayer/common/GPC_System.h
+++ b/source/gameengine/GamePlayer/common/GPC_System.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_SYSTEM_H
-#define __GPC_SYSTEM_H
+#ifndef __GPC_SYSTEM_H__
+#define __GPC_SYSTEM_H__
 
 #if defined(WIN32)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -59,5 +59,5 @@ public:
 //	NG_NetworkDeviceInterface* m_ndi;
 };
 
-#endif  // __GPC_SYSTEM_H
+#endif  // __GPC_SYSTEM_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
index 217cfc5eb88..e96cd50b9f4 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPG_CANVAS_H_
-#define _GPG_CANVAS_H_
+#ifndef __GPG_CANVAS_H__
+#define __GPG_CANVAS_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -66,5 +66,5 @@ public:
 	void EndDraw() {};
 };
 
-#endif // _GPG_CANVAS_H_
+#endif // __GPG_CANVAS_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
index 2c7ba86e438..57fd0694ec0 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
@@ -30,8 +30,8 @@
  *  \brief GHOST Blender Player keyboard device.
  */
 
-#ifndef _GPG_KEYBOARDDEVICE_H_
-#define _GPG_KEYBOARDDEVICE_H_
+#ifndef __GPG_KEYBOARDDEVICE_H__
+#define __GPG_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -53,5 +53,5 @@ public:
 	virtual ~GPG_KeyboardDevice(void);
 };
 
-#endif //_GPG_KEYBOARDDEVICE_H_
+#endif //__GPG_KEYBOARDDEVICE_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.h b/source/gameengine/GamePlayer/ghost/GPG_System.h
index d7f3093d8b0..796ad0c2b8c 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_System.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_System.h
@@ -30,8 +30,8 @@
  *  \brief Blender Player system on GHOST.
  */
 
-#ifndef _GPG_SYSTEM_H_
-#define _GPG_SYSTEM_H_
+#ifndef __GPG_SYSTEM_H__
+#define __GPG_SYSTEM_H__
 
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -51,5 +51,5 @@ public:
 	virtual double GetTimeInSeconds();
 };
 
-#endif // _GPG_SYSTEM_H_
+#endif // __GPG_SYSTEM_H__