diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-18 17:50:49 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-18 17:50:49 +0300 |
| commit | 71e80f606c06f76bc425098b70116e21fe032c30 (patch) | |
| tree | 1cbad06f88d270a6255e2f103a50ec3689a4dad4 /source/blender/blenlib/BLI_math_base.h | |
| parent | 75bcf5b0b12949421c7e5c2d6dc0288a4a0e4c52 (diff) | |
Remove #ifdef __cplusplus, as it caused C2732 (differences in linkage). Compiles and runs fine without.
Diffstat (limited to 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 3a12b914014..6ff57b08724 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -32,10 +32,6 @@ * \ingroup bli */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef WIN32 #define _USE_MATH_DEFINES #endif @@ -172,15 +168,11 @@ MINLINE float power_of_2(float f); MINLINE float shell_angle_to_dist(float angle); #if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS) -double copysign(double x, double y); -double round(double x); +extern double copysign(double x, double y); +extern double round(double x); #endif double double_round(double x, int ndigits); -#ifdef __cplusplus -} -#endif - #endif /* BLI_MATH_BASE_H */ |