Fixed conflict

ago%!(EXTRA string=12 years) · af77fb3118
parent d8aba7302d
commit af77fb3118
2 changed files with 20 additions and 18 deletions
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@ -667,6 +667,8 @@
 #		define GLM_INLINE __forceinline
 #	elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34))
 #		define GLM_INLINE __attribute__((always_inline))
+#	elif(GLM_COMPILER & GLM_COMPILER_CLANG)
+#		define GLM_INLINE __attribute__((always_inline))
 #	else
 #		define GLM_INLINE inline
 #	endif//GLM_COMPILER