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/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp')
-rw-r--r--extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
index ea9240c2bcf..311fd8b5eed 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
@@ -39,11 +39,15 @@
#include <string.h>
#include <stdio.h>
-#ifdef WIN32
+#if defined (WIN32)
#include <malloc.h>
#else
+#if defined (__FreeBSD__)
+#include <stdlib.h>
+#else
#include <alloca.h>
#endif
+#endif
#include "Dynamics/BU_Joint.h"
#include "ContactSolverInfo.h"
@@ -838,4 +842,4 @@ void SolveInternal1 (float global_cfm,
}
-#endif //USE_SOR_SOLVER \ No newline at end of file
+#endif //USE_SOR_SOLVER