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. --- .../UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h | 2 -- .../UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h | 2 -- .../python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h | 2 -- 3 files changed, 6 deletions(-) (limited to 'source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void') diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h index 3c89e9b9ac0..968ab25da3b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject ChainingTimeStampF1D_Type; #define BPy_ChainingTimeStampF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainingTimeStampF1D_Type)) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h index 92b990ac21c..e55e189d140 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject IncrementChainingTimeStampF1D_Type; #define BPy_IncrementChainingTimeStampF1D_Check(v) \ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h index 60becf26f48..0117231c4f1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject TimeStampF1D_Type; #define BPy_TimeStampF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TimeStampF1D_Type)) -- cgit v1.2.3