diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
| commit | 4e6590067d5c398479d0d041b3afacc26d24061d (patch) | |
| tree | 6b3bc29116a7212d4ab56367016f8b6e799b705f /extern | |
| parent | 749d284b498fb1cde7996d712497ce478c978f3a (diff) | |
revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/patches/MinGW64-nopermissive.patch | 39 | ||||
| -rw-r--r-- | extern/bullet2/src/LinearMath/btSerializer.h | 13 |
2 files changed, 3 insertions, 49 deletions
diff --git a/extern/bullet2/patches/MinGW64-nopermissive.patch b/extern/bullet2/patches/MinGW64-nopermissive.patch deleted file mode 100644 index 915f232f6d7..00000000000 --- a/extern/bullet2/patches/MinGW64-nopermissive.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: LinearMath/btSerializer.h -=================================================================== ---- LinearMath/btSerializer.h (revision 45919) -+++ LinearMath/btSerializer.h (working copy) -@@ -25,8 +25,15 @@ - #endif - #include <string.h> - -+#if defined(_WIN64) -+# ifdef __MINGW64__ -+# include <basetsd.h> -+# endif -+typedef __int64 int_ptr; -+#else -+typedef long int_ptr; -+#endif - -- - ///only the 32bit versions for now - extern unsigned char sBulletDNAstr[]; - extern int sBulletDNAlen; -@@ -247,7 +254,7 @@ - cp++; - } - { -- nr= (long)cp; -+ nr= (int_ptr)cp; - // long mask=3; - nr= ((nr+3)&~3)-nr; - while (nr--) -@@ -282,7 +289,7 @@ - } - - { -- nr= (long)cp; -+ nr= (int_ptr)cp; - // long mask=3; - nr= ((nr+3)&~3)-nr; - while (nr--) diff --git a/extern/bullet2/src/LinearMath/btSerializer.h b/extern/bullet2/src/LinearMath/btSerializer.h index a1e766c95ce..8a89374c612 100644 --- a/extern/bullet2/src/LinearMath/btSerializer.h +++ b/extern/bullet2/src/LinearMath/btSerializer.h @@ -25,14 +25,7 @@ subject to the following restrictions: #endif #include <string.h> -#if defined(_WIN64) -# ifdef __MINGW64__ -# include <basetsd.h> -# endif -typedef __int64 int_ptr; -#else -typedef long int_ptr; -#endif + ///only the 32bit versions for now extern unsigned char sBulletDNAstr[]; @@ -254,7 +247,7 @@ protected: cp++; } { - nr= (int_ptr)cp; + nr= (long)cp; // long mask=3; nr= ((nr+3)&~3)-nr; while (nr--) @@ -289,7 +282,7 @@ protected: } { - nr= (int_ptr)cp; + nr= (long)cp; // long mask=3; nr= ((nr+3)&~3)-nr; while (nr--) |