diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h b/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h index fa99eebb60e..e203888a1e2 100644 --- a/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h +++ b/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h @@ -1,7 +1,7 @@ #ifndef GIM_MEMORY_H_INCLUDED #define GIM_MEMORY_H_INCLUDED /*! \file gim_memory.h -\author Francisco Len Nßjera +\author Francisco Leon Najera */ /* ----------------------------------------------------------------------------- @@ -34,7 +34,7 @@ email: projectileman@yahoo.com #include "gim_math.h" -#include <memory.h> +#include <string.h> #ifdef PREFETCH #include <xmmintrin.h> // for prefetch @@ -117,7 +117,7 @@ void gim_free(void *ptr); -#if defined (WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined (_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) #define GIM_SIMD_MEMORY 1 #endif |