Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet2/src/LinearMath/btSerializer.h')
-rw-r--r--extern/bullet2/src/LinearMath/btSerializer.h13
1 files changed, 3 insertions, 10 deletions
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--)