From 0db3c5f74300980d35b3114992c299f072b913b1 Mon Sep 17 00:00:00 2001
From: Antony Riakiotakis <kalast@gmail.com>
Date: Tue, 24 Apr 2012 14:33:44 +0000
Subject: Remove mingw-w64 errors from loss of precision by converting 64bit
 pointers to ints. All cases found were harmless and the error behaviour could
 be turned off by the -fpermissive flag but I'd rather keep that off to detect
 any real problems should they arise.

---
 intern/audaspace/intern/AUD_Buffer.cpp             | 11 ++++++++++-
 .../audaspace/patches/mingw64-nopermissive.patch   | 23 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 intern/audaspace/patches/mingw64-nopermissive.patch

(limited to 'intern/audaspace')

diff --git a/intern/audaspace/intern/AUD_Buffer.cpp b/intern/audaspace/intern/AUD_Buffer.cpp
index b7157f672b4..624a4d0b2c8 100644
--- a/intern/audaspace/intern/AUD_Buffer.cpp
+++ b/intern/audaspace/intern/AUD_Buffer.cpp
@@ -33,7 +33,16 @@
 #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)
 {
diff --git a/intern/audaspace/patches/mingw64-nopermissive.patch b/intern/audaspace/patches/mingw64-nopermissive.patch
new file mode 100644
index 00000000000..64420d240f3
--- /dev/null
+++ b/intern/audaspace/patches/mingw64-nopermissive.patch
@@ -0,0 +1,23 @@
+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;
-- 
cgit v1.2.3