From 377e2bfb07f40c404b1f6cf5d1c070985218392b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 6 May 2011 11:57:10 +0100 Subject: [PATCH] Updated 64 types support to include C99 compiler --- glm/core/_detail.hpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 9b36a921..dbf1ab1b 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -18,19 +18,15 @@ namespace detail { class thalf; -#if(GLM_COMPILER & GLM_COMPILER_VC) +#if(__STDC_VERSION__ >= 199901L) // C99 detected, 64 bit types available + typedef int64_t sint64; + typedef uint64_t uint64; +#elif(GLM_COMPILER & GLM_COMPILER_VC) typedef signed __int64 sint64; typedef unsigned __int64 uint64; #elif(GLM_COMPILER & GLM_COMPILER_GCC) __extension__ typedef signed long long sint64; __extension__ typedef unsigned long long uint64; -//# if GLM_MODEL == GLM_MODEL_64 -// typedef signed long highp_int_t; -// typedef unsigned long highp_uint_t; -//# elif GLM_MODEL == GLM_MODEL_32 -// __extension__ typedef signed long long highp_int_t; -// __extension__ typedef unsigned long long highp_uint_t; -//# endif//GLM_MODEL #elif(GLM_COMPILER & GLM_COMPILER_BC) typedef Int64 sint64; typedef Uint64 uint64;