diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 07:25:41 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:37:07 +0400 |
commit | 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c (patch) | |
tree | 42387e363c64f488beb00cd1a2139f17ce96fda5 /source/blender/freestyle/intern/python/UnaryPredicate1D | |
parent | 5db8da81055be7fb89b4d824ce17e61ffeb46060 (diff) |
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.
Diffstat (limited to 'source/blender/freestyle/intern/python/UnaryPredicate1D')
10 files changed, 0 insertions, 20 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h index aba39fb6557..154a268538c 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ContourUP1D_Type; #define BPy_ContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ContourUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h index 618d7f701f2..beed0ce0ed9 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject DensityLowerThanUP1D_Type; #define BPy_DensityLowerThanUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityLowerThanUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h index ef4e2ba6320..f4ca8a82a20 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject EqualToChainingTimeStampUP1D_Type; #define BPy_EqualToChainingTimeStampUP1D_Check(v) \ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h index 58266057911..8bd222c7430 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject EqualToTimeStampUP1D_Type; #define BPy_EqualToTimeStampUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToTimeStampUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h index 6e789960bc9..cc346a8c814 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ExternalContourUP1D_Type; #define BPy_ExternalContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ExternalContourUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h index 34eb70fa193..adce6ad68c9 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject FalseUP1D_Type; #define BPy_FalseUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FalseUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h index f605e452ec2..8450e383277 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject QuantitativeInvisibilityUP1D_Type; #define BPy_QuantitativeInvisibilityUP1D_Check(v) \ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h index 9e018d606d3..2cea311ce20 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ShapeUP1D_Type; #define BPy_ShapeUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ShapeUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h index 26c32da3db6..69467ee1733 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject TrueUP1D_Type; #define BPy_TrueUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TrueUP1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h index 430864c3966..696f5d3063c 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject WithinImageBoundaryUP1D_Type; #define BPy_WithinImageBoundaryUP1D_Check(v) \ |