revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too

2 files changed, 1 insertions, 33 deletions

diff --git a/intern/audaspace/intern/AUD_Buffer.cpp b/intern/audaspace/intern/AUD_Buffer.cpp
index 624a4d0b2c8..b7157f672b4 100644
--- a/intern/audaspace/intern/AUD_Buffer.cpp
+++ b/intern/audaspace/intern/AUD_Buffer.cpp
@@ -33,16 +33,7 @@
 #include <cstring>
 #include <cstdlib>
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
-#define AUD_ALIGN(a) (a + 16 - ((uint_ptr)a & 15))
+#define AUD_ALIGN(a) (a + 16 - ((long)a & 15))
 
 AUD_Buffer::AUD_Buffer(int size)
 {
diff --git a/intern/audaspace/patches/mingw64-nopermissive.patch b/intern/audaspace/patches/mingw64-nopermissive.patch
deleted file mode 100644
index 64420d240f3..00000000000
--- a/intern/audaspace/patches/mingw64-nopermissive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: intern/AUD_Buffer.cpp
-===================================================================
---- intern/AUD_Buffer.cpp	(revision 45919)
-+++ intern/AUD_Buffer.cpp	(working copy)
-@@ -33,8 +33,17 @@
- #include <cstring>
- #include <cstdlib>
- 
--#define AUD_ALIGN(a) (a + 16 - ((long)a & 15))
-+#if defined(_WIN64)
-+#  ifdef __MINGW64__
-+#    include <basetsd.h>
-+#  endif
-+typedef unsigned __int64 uint_ptr;
-+#else
-+typedef unsigned long uint_ptr;
-+#endif
- 
-+#define AUD_ALIGN(a) (a + 16 - ((uint_ptr)a & 15))
-+
- AUD_Buffer::AUD_Buffer(int size)
- {
- 	m_size = size;