Merge commit '0d362d69d7103a01103d641d92eb9f42b6f7579c' as 'third_par…

…ty/glm'
youtube · Sep 1, 2023 · 997abb1 · 997abb1
2 parents 4743e51 + 0d362d6
commit 997abb1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/third_party/glm/.gitignore b/third_party/glm/.gitignore
@@ -48,7 +48,7 @@ Makefile
 
 # Misc.
 *.log
-.DS_Store
 
 # local build(s)
 build*
+
diff --git a/third_party/glm/glm/detail/type_int.hpp b/third_party/glm/glm/detail/type_int.hpp
@@ -4,10 +4,8 @@
 #pragma once
 
 #include "setup.hpp"
-
 #if defined(STARBOARD)
 #include "starboard/types.h"
-
 #else  // defined(STARBOARD)
 #if GLM_HAS_MAKE_SIGNED
 #	include <type_traits>