Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed conflict

Christophe Riccio 13 years ago
parent
efcecbd81a af77fb3118
commit
c64e53e42f
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      glm/core/_detail.hpp

+ 1 - 1
glm/core/_detail.hpp
View File 

@@ -384,7 +384,7 @@ namespace detail
 
 #	define GLM_RESTRICT
 
 #	define GLM_RESTRICT_VAR __restrict
 
 #	define GLM_CONSTEXPR
 
-#elif((GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC)) && (GLM_COMPILER >= GLM_COMPILER_GCC31))
 
+#elif(((GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC)) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) || (GLM_COMPILER & GLM_COMPILER_CLANG))
 
 #	define GLM_DEPRECATED __attribute__((__deprecated__))
 
 #	define GLM_ALIGN(x) __attribute__((aligned(x)))
 
 #	define GLM_ALIGNED_STRUCT(x) struct __attribute__((aligned(x)))