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

4 files changed, 3 insertions, 71 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;
diff --git a/intern/elbeem/intern/ntl_geometrymodel.cpp b/intern/elbeem/intern/ntl_geometrymodel.cpp
index b518416b639..13220736b8e 100644
--- a/intern/elbeem/intern/ntl_geometrymodel.cpp
+++ b/intern/elbeem/intern/ntl_geometrymodel.cpp
@@ -21,14 +21,7 @@
 #endif
 #endif // WIN32
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
-typedef __int64 int_ptr;
-#else
-typedef long int_ptr;
-#endif
+
 /******************************************************************************
  * Default Constructor 
  *****************************************************************************/
@@ -171,7 +164,7 @@ int ntlGeometryObjModel::initModel(int numVertices, float *vertices, int numTria
 	}
 
 	//fprintf(stderr,"initModel DEBUG %d \n",channelSize);
-	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(int_ptr)(channelVertices) ,10);
+	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(long)(channelVertices) ,10);
 	if(channelVertices && (channelSize>0)) {
 		vector<ntlSetVec3f> aniverts;
 		vector<ntlSetVec3f> aninorms;
diff --git a/intern/elbeem/patches/mingw64_nopermissive.patch b/intern/elbeem/patches/mingw64_nopermissive.patch
deleted file mode 100644
index a01e65d43e4..00000000000
--- a/intern/elbeem/patches/mingw64_nopermissive.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: intern/ntl_geometrymodel.cpp
-===================================================================
---- intern/ntl_geometrymodel.cpp	(revision 45919)
-+++ intern/ntl_geometrymodel.cpp	(working copy)
-@@ -21,7 +21,14 @@
- #endif
- #endif // WIN32
- 
--
-+#if defined(_WIN64)
-+#  ifdef __MINGW64__
-+#    include <basetsd.h>
-+#  endif
-+typedef __int64 int_ptr;
-+#else
-+typedef long int_ptr;
-+#endif
- /******************************************************************************
-  * Default Constructor 
-  *****************************************************************************/
-@@ -164,7 +171,7 @@
- 	}
- 
- 	//fprintf(stderr,"initModel DEBUG %d \n",channelSize);
--	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(long)(channelVertices) ,10);
-+	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(int_ptr)(channelVertices) ,10);
- 	if(channelVertices && (channelSize>0)) {
- 		vector<ntlSetVec3f> aniverts;
- 		vector<ntlSetVec3f> aninorms;