anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed conflict

Browse Source
master
Christophe Riccio ago%!(EXTRA string=12 years)
parent d8aba7302d
commit af77fb3118
2 changed files with 20 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      glm/core/setup.hpp

6
glm/core/setup.hpp
Unescape View File

@ -657,9 +657,9 @@
#endif #endif
#if GLM_COMPILER & GLM_COMPILER_GCC #if GLM_COMPILER & GLM_COMPILER_GCC
#define GLM_VAR_USED __attribute__ ((unused)) # define GLM_VAR_USED __attribute__ ((unused))
#else #else
#define GLM_VAR_USED # define GLM_VAR_USED
#endif #endif
#if(defined(GLM_FORCE_INLINE)) #if(defined(GLM_FORCE_INLINE))
@ -667,6 +667,8 @@
# define GLM_INLINE __forceinline # define GLM_INLINE __forceinline
# elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34)) # elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34))
# define GLM_INLINE __attribute__((always_inline)) # define GLM_INLINE __attribute__((always_inline))
# elif(GLM_COMPILER & GLM_COMPILER_CLANG)
# define GLM_INLINE __attribute__((always_inline))
# else # else
# define GLM_INLINE inline # define GLM_INLINE inline
# endif//GLM_COMPILER # endif//GLM_COMPILER

Write Preview
Loading…
Cancel
Save