From de3305ccefbf15214a0329f39135cd657d3fcccb Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sat, 17 Dec 2011 18:55:30 +0000
Subject: [PATCH] Fixed ticket #157, conflict with WinGDI.h

---
 glm/core/_detail.hpp          | 30 +++++++++++++++---------------
 glm/core/func_exponential.inl |  4 ++--
 glm/gtx/integer.inl           |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp
index 6870db05..8de4fd7a 100644
--- a/glm/core/_detail.hpp
+++ b/glm/core/_detail.hpp
@@ -357,82 +357,82 @@ namespace detail
 	{
 		enum
 		{
-			ERROR,
-			FLOAT,
-			INT
+			GLM_ERROR,
+			GLM_FLOAT,
+			GLM_INT
 		};
 	};
 
 	template <typename T>
 	struct float_or_int_trait
 	{
-		enum{ID = float_or_int_value::ERROR};
+		enum{ID = float_or_int_value::GLM_ERROR};
 	};
 
 	template <>
 	struct float_or_int_trait<int8>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<int16>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<int32>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<int64>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<uint8>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<uint16>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<uint32>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<uint64>
 	{
-		enum{ID = float_or_int_value::INT};
+		enum{ID = float_or_int_value::GLM_INT};
 	};
 
 	template <>
 	struct float_or_int_trait<float16>
 	{
-		enum{ID = float_or_int_value::FLOAT};
+		enum{ID = float_or_int_value::GLM_FLOAT};
 	};
 
 	template <>
 	struct float_or_int_trait<float32>
 	{
-		enum{ID = float_or_int_value::FLOAT};
+		enum{ID = float_or_int_value::GLM_FLOAT};
 	};
 
 	template <>
 	struct float_or_int_trait<float64>
 	{
-		enum{ID = float_or_int_value::FLOAT};
+		enum{ID = float_or_int_value::GLM_FLOAT};
 	};
 
 }//namespace detail
diff --git a/glm/core/func_exponential.inl b/glm/core/func_exponential.inl
index c57852c1..f5c1d2e7 100644
--- a/glm/core/func_exponential.inl
+++ b/glm/core/func_exponential.inl
@@ -89,7 +89,7 @@ namespace glm
 
 namespace detail
 {
-	template <int PATH = float_or_int_value::ERROR>
+	template <int PATH = float_or_int_value::GLM_ERROR>
 	struct compute_log2
 	{
 		template <typename T>
@@ -101,7 +101,7 @@ namespace detail
 	};
 
 	template <>
-	struct compute_log2<float_or_int_value::FLOAT>
+	struct compute_log2<float_or_int_value::GLM_FLOAT>
 	{
 		template <typename T>
 		T operator() (T const & Value) const
diff --git a/glm/gtx/integer.inl b/glm/gtx/integer.inl
index 4342cf1a..73e730c8 100644
--- a/glm/gtx/integer.inl
+++ b/glm/gtx/integer.inl
@@ -55,7 +55,7 @@ namespace detail
 	}
 
 	template <>
-	struct compute_log2<float_or_int_value::INT>
+	struct compute_log2<float_or_int_value::GLM_INT>
 	{
 		template <typename T>
 		T operator() (T const & Value) const