[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34970] trunk/blender/source/blender/ blenlib/BLI_math_base.h: Remove #ifdef __cplusplus, as it caused C2732 ( differences in linkage).

[Nathan Letwory]

Revision: 34970
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34970
Author:   jesterking
Date:     2011-02-18 14:50:49 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Remove #ifdef __cplusplus, as it caused C2732 (differences in linkage). Compiles and runs fine without.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_math_base.h

Modified: trunk/blender/source/blender/blenlib/BLI_math_base.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_base.h	2011-02-18 14:30:36 UTC (rev 34969)
+++ trunk/blender/source/blender/blenlib/BLI_math_base.h	2011-02-18 14:50:49 UTC (rev 34970)
@@ -32,10 +32,6 @@
  *  \ingroup bli
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef WIN32
 #define _USE_MATH_DEFINES
 #endif
@@ -172,15 +168,11 @@
 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 */