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/Iterator | |
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/Iterator')
10 files changed, 13 insertions, 38 deletions
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h index 20deea25c10..51fb3e5ebdc 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h @@ -25,9 +25,9 @@ #ifndef __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ #define __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ -#include "../../stroke/ChainingIterators.h" #include "../BPy_Iterator.h" +#include "../../stroke/ChainingIterators.h" #ifdef __cplusplus extern "C" { @@ -35,8 +35,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject AdjacencyIterator_Type; #define BPy_AdjacencyIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&AdjacencyIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h index 0a7d97813b5..733a16e3974 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h @@ -25,19 +25,16 @@ #ifndef __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ #define __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ +#include "BPy_ChainingIterator.h" #include "../../stroke/ChainingIterators.h" -#include "BPy_ChainingIterator.h" - #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ChainPredicateIterator_Type; #define BPy_ChainPredicateIterator_Check(v) \ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h index d58c3ffd294..e76c04a6640 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h @@ -25,19 +25,16 @@ #ifndef __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ #define __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ +#include "BPy_ChainingIterator.h" #include "../../stroke/ChainingIterators.h" -#include "BPy_ChainingIterator.h" - #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ChainSilhouetteIterator_Type; #define BPy_ChainSilhouetteIterator_Check(v) \ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h index 93526921ae3..72015e6a0d9 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h @@ -25,19 +25,16 @@ #ifndef __FREESTYLE_PYTHON_CHAININGITERATOR_H__ #define __FREESTYLE_PYTHON_CHAININGITERATOR_H__ +#include "BPy_ViewEdgeIterator.h" #include "../../stroke/ChainingIterators.h" -#include "BPy_ViewEdgeIterator.h" - #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ChainingIterator_Type; #define BPy_ChainingIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainingIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h index 104c8557754..8c93ac2c014 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h @@ -25,18 +25,16 @@ #ifndef __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ #define __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ -#include "../../stroke/CurveIterators.h" - #include "../BPy_Iterator.h" +#include "../../stroke/CurveIterators.h" + #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject CurvePointIterator_Type; #define BPy_CurvePointIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurvePointIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h index 224fe13c576..5b1b70f19e8 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h @@ -25,9 +25,9 @@ #ifndef __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ #define __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ -#include "../../view_map/Interface0D.h" #include "../BPy_Iterator.h" +#include "../../view_map/Interface0D.h" #ifdef __cplusplus extern "C" { @@ -35,8 +35,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject Interface0DIterator_Type; #define BPy_Interface0DIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Interface0DIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h index 858609efe47..a430e4e7876 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h @@ -25,10 +25,9 @@ #ifndef __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ #define __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ -#include "../../view_map/ViewMapIterators.h" - #include "../BPy_Iterator.h" +#include "../../view_map/ViewMapIterators.h" #ifdef __cplusplus extern "C" { @@ -36,8 +35,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject SVertexIterator_Type; #define BPy_SVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SVertexIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h index 4ce11191b1c..18bad65b00a 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h @@ -25,18 +25,16 @@ #ifndef __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ #define __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ -#include "../../stroke/StrokeIterators.h" - #include "../BPy_Iterator.h" +#include "../../stroke/StrokeIterators.h" + #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject StrokeVertexIterator_Type; #define BPy_StrokeVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeVertexIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h index eb11dd6cdea..47244dcb5f2 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h @@ -25,19 +25,16 @@ #ifndef __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ #define __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ +#include "../BPy_Iterator.h" #include "../../view_map/ViewMapIterators.h" -#include "../BPy_Iterator.h" - #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ViewEdgeIterator_Type; #define BPy_ViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdgeIterator_Type)) diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h index 999e0ecad5d..3dea73cdd08 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h @@ -26,18 +26,16 @@ #define __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ #include "../../stroke/Stroke.h" -#include "../../view_map/ViewMapIterators.h" - #include "../BPy_Iterator.h" +#include "../../view_map/ViewMapIterators.h" + #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject orientedViewEdgeIterator_Type; #define BPy_orientedViewEdgeIterator_Check(v) \ |