From 1625a495a855a637dc7cb0d885106f9d9ea76e01 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sun, 18 Dec 2011 20:05:02 +0000
Subject: [PATCH] Fixed model, 32/64bits detection on MacOS X

---
 glm/core/setup.hpp               | 14 +++-----------
 test/core/core_setup_message.cpp |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index 4ba43ad7..4137565e 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -393,18 +393,10 @@
 /////////////////
 // Build model //
 
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-#	if defined(_M_X64)
+#if((defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__))
 #		define GLM_MODEL	GLM_MODEL_64
-#	else
-#		define GLM_MODEL	GLM_MODEL_32
-#	endif//_M_X64
-#elif(GLM_COMPILER & GLM_COMPILER_GCC)
-#	if(defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(__x86_64__)
-#		define GLM_MODEL	GLM_MODEL_64
-#	else
-#		define GLM_MODEL	GLM_MODEL_32
-#	endif//
+#elif(defined(__i386__) || defined(__ppc__))
+#	define GLM_MODEL	GLM_MODEL_32
 #else
 #	define GLM_MODEL	GLM_MODEL_32
 #endif//
diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp
index a1bb420d..40500d54 100644
--- a/test/core/core_setup_message.cpp
+++ b/test/core/core_setup_message.cpp
@@ -13,7 +13,7 @@
 
 int test_compiler()
 {
-	int Error = 0;
+	int Error(0);
 	
 	switch(GLM_COMPILER)
 	{