mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed conflict

Browse Source
This commit is contained in:
Christophe Riccio
2013-02-20 15:46:10 +01:00
parent d8aba7302d
commit af77fb3118
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/setup.hpp
View File

@@ -657,9 +657,9 @@
#endif
#if GLM_COMPILER & GLM_COMPILER_GCC
#define GLM_VAR_USED __attribute__ ((unused))
# define GLM_VAR_USED __attribute__ ((unused))
#else
#define GLM_VAR_USED
# define GLM_VAR_USED
#endif
#if(defined(GLM_FORCE_INLINE))
@@ -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