diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-15 11:21:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-15 11:21:07 +0400 |
| commit | 004decc1d940a7d744ffcc63f4e53dd727dfea34 (patch) | |
| tree | fe224d1baa1dfa71063778ee291cdd4265401068 /source | |
| parent | 56f6bc06d3c322d2f51a88b96c7367bc5dfeaf37 (diff) | |
Code cleanup: warnings
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 883f01d4eb6..9c77ba921e0 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -240,7 +240,7 @@ MINLINE unsigned short highest_order_bit_s(unsigned short n); MINLINE float shell_angle_to_dist(const float angle); -#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS) +#if defined(MSC_VER) && (MSC_VER < 1800) extern double copysign(double x, double y); extern double round(double x); #endif diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 4baca862682..ce55a452d3e 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -2143,7 +2143,7 @@ void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *func) void RNA_def_property_update_runtime(PropertyRNA *prop, const void *func) { - prop->update = func; + prop->update = (void *)func; } void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength) |