From 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 17 Apr 2014 12:25:41 +0900 Subject: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2). (See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of the problem). Fixed for #include not properly put in the extern "C" { ... } construct. Also removed redundant inclusion of the header file in the Freestyle Python API code. --- .../blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h') 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 - extern PyTypeObject ViewEdgeIterator_Type; #define BPy_ViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdgeIterator_Type)) -- cgit v1.2.3