[Bf-blender-cvs] [5d4a6a9] master: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2).

Tamito Kajiyama noreply at git.blender.org
Thu Apr 17 07:37:36 CEST 2014


Commit: 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c
Author: Tamito Kajiyama
Date:   Thu Apr 17 12:25:41 2014 +0900
https://developer.blender.org/rB5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c

Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Fixed for #include <Python.h> not properly put in the extern "C" { ... } construct.

Also removed redundant inclusion of the header file in the Freestyle Python API code.

===================================================================

M	source/blender/freestyle/intern/python/BPy_BBox.h
M	source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
M	source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
M	source/blender/freestyle/intern/python/BPy_ContextFunctions.h
M	source/blender/freestyle/intern/python/BPy_Convert.h
M	source/blender/freestyle/intern/python/BPy_Freestyle.h
M	source/blender/freestyle/intern/python/BPy_FrsMaterial.h
M	source/blender/freestyle/intern/python/BPy_FrsNoise.h
M	source/blender/freestyle/intern/python/BPy_Id.h
M	source/blender/freestyle/intern/python/BPy_IntegrationType.h
M	source/blender/freestyle/intern/python/BPy_Interface0D.h
M	source/blender/freestyle/intern/python/BPy_Interface1D.h
M	source/blender/freestyle/intern/python/BPy_Iterator.h
M	source/blender/freestyle/intern/python/BPy_MediumType.h
M	source/blender/freestyle/intern/python/BPy_Nature.h
M	source/blender/freestyle/intern/python/BPy_Operators.h
M	source/blender/freestyle/intern/python/BPy_SShape.h
M	source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
M	source/blender/freestyle/intern/python/BPy_StrokeShader.h
M	source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
M	source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
M	source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
M	source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
M	source/blender/freestyle/intern/python/BPy_ViewMap.h
M	source/blender/freestyle/intern/python/BPy_ViewShape.h
M	source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
M	source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
M	source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
M	source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
M	source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
M	source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
M	source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
M	source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
M	source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
M	source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
M	source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
M	source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
M	source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
M	source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
M	source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
M	source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
M	source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
M	source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
M	source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
M	source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
M	source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
M	source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
M	source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
M	source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
M	source/blender/freestyle/intern/system/PythonInterpreter.h

===================================================================

diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 6f8a3d2..089c216 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_BBOX_H__
 #define __FREESTYLE_PYTHON_BBOX_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../geometry/BBox.h"
 #include "../geometry/Geom.h"
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index 9622ca1..a9a2297 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
 #define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../stroke/Predicates0D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 07a3d29..43511ed 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
 #define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../stroke/Predicates1D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
index 16e63be..4065277 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
 #define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 45fc05a..cf55ba3 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -25,7 +25,10 @@
 #ifndef __FREESTYLE_PYTHON_CONVERT_H__
 #define __FREESTYLE_PYTHON_CONVERT_H__
 
+extern "C" {
 #include <Python.h>
+}
+
 #include <typeinfo>
 
 #include "../geometry/Geom.h"
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index c253a81..0ed2e00 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -25,12 +25,12 @@
 #ifndef __FREESTYLE_PYTHON_FREESTYLE_H__
 #define __FREESTYLE_PYTHON_FREESTYLE_H__
 
-#include <Python.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <Python.h>
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------------------Python BPy_Freestyle visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index 62a9f2c..7cbf535 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_FRSMATERIAL_H__
 #define __FREESTYLE_PYTHON_FRSMATERIAL_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../scene_graph/FrsMaterial.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
index 14d8696..19788e3 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_FRSNOISE_H__
 #define __FREESTYLE_PYTHON_FRSNOISE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../geometry/Noise.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index d4b635a..62e4806 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -25,7 +25,10 @@
 #ifndef __FREESTYLE_PYTHON_ID_H__
 #define __FREESTYLE_PYTHON_ID_H__
 
+extern "C" {
 #include <Python.h>
+}
+
 #include <iostream>
 
 using namespace std;
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
index 36b925f..feabe30 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
 #define __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Interface1D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
index 02929bc..b8a4a6b 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_INTERFACE0D_H__
 #define __FREESTYLE_PYTHON_INTERFACE0D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Interface0D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
index 9bc4477..17c0752 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_INTERFACE1D_H__
 #define __FREESTYLE_PYTHON_INTERFACE1D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Interface1D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
index a739787..dcb8191 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_ITERATOR_H__
 #define __FREESTYLE_PYTHON_ITERATOR_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../system/Iterator.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
index 120829e..d99fb53 100644
--- a/source/blender/freestyle/intern/python/BPy_MediumType.h
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_MEDIUMTYPE_H__
 #define __FREESTYLE_PYTHON_MEDIUMTYPE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../stroke/Stroke.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
index 0b9901b..ad6bc0f 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.h
+++ b/source/blender/freestyle/intern/python/BPy_Nature.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_NATURE_H__
 #define __FREESTYLE_PYTHON_NATURE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../winged_edge/Nature.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h
index be9514f..86d23c4 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.h
+++ b/source/blender/freestyle/intern/python/BPy_Operators.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_OPERATORS_H__
 #define __FREESTYLE_PYTHON_OPERATORS_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../stroke/Operators.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
index 8e7d3b6..4919a34 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_SSHAPE_H__
 #define __FREESTYLE_PYTHON_SSHAPE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Silhouette.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
index 6d30b6b..ce2384e 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
 #define __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../stroke/Stroke.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
index 19af600..9149858 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_STROKESHADER_H__
 #define __FREESTYLE_PYTHON_STROKESHADER_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../system/FreestyleConfig.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 3b6a2ab..58126d5 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
 #define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Functions0D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 87c4430..0b38b3d 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -25,7 +25,9 @@
 #ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
 #define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
 
+extern "C" {
 #include <Python.h>
+}
 
 #include "../view_map/Functions1D.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
index 0101a5

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list