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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-10-21 11:29:15 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-10-21 11:29:15 +0400
commitec6b9948ace08c3925486a009147af2fe0a6e4f0 (patch)
treec8408add6cad7fb4aab12761f8cc99dff0b87622
parent6fc16a6e44b704c34b2f0a3c65318fdd01491382 (diff)
Include BLI_math.h instead of math.h.
Silence a warning.
-rw-r--r--source/blender/blenkernel/intern/unit.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 25aab77ba9b..83ace49eb67 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -26,11 +26,7 @@
#include <string.h>
#include "BKE_unit.h"
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif
-#include <math.h>
-
+#include "BLI_math.h"
#include "BLI_winstuff.h"
@@ -687,7 +683,7 @@ void bUnit_ToUnitAltName(char *str, int len_max, char *orig_str, int system, int
found= unit_find_str(orig_str, unit->name_short);
if(found) {
- int offset= found - orig_str;
+ int offset= (int)(found - orig_str);
int len_name= 0;
/* copy everything before the unit */