Merge pull request #8937 from void-ppc64/assimp

assimp: restrict a patch that breaks build on ppc
This commit is contained in:
maxice8 2019-02-20 00:28:02 -03:00 committed by GitHub
commit 588341d657
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,7 +4,7 @@
/// \author smal.root@gmail.com
/// \date 2016
+#if !defined(__x86_64__) && !defined(__i386__)
+#if defined(__arm__)
+// Avoid conflict for types GLsizeiptr and GLintptr
+#define GL_VERSION_1_5
+