summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch')
-rw-r--r--src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch b/src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch
new file mode 100644
index 000000000..a50248d7b
--- /dev/null
+++ b/src/3rdparty/patches/0004-assimp-Remove-register-keyword.patch
@@ -0,0 +1,12 @@
+diff -ur assimpGIT/contrib/unzip/crypt.h assimp/contrib/unzip/crypt.h
+--- assimpGIT/contrib/unzip/crypt.h 2016-12-07 20:20:54.000000000 -0500
++++ assimp/contrib/unzip/crypt.h 2016-12-07 17:00:44.000000000 -0500
+@@ -51,7 +51,7 @@
+ (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+ (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+ {
+- register int keyshift = (int)((*(pkeys+1)) >> 24);
++ int keyshift = (int)((*(pkeys+1)) >> 24);
+ (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+ }
+ return c;