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.
This commit is contained in:
2014-04-17 12:25:41 +09:00
parent 5db8da8105
commit 5d4a6a94ef
157 changed files with 83 additions and 286 deletions

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DDouble_Type;
#define BPy_UnaryFunction0DDouble_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DDouble_Type))

View File

@@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DEdgeNature_Type;
#define BPy_UnaryFunction0DEdgeNature_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DFloat_Type;
#define BPy_UnaryFunction0DFloat_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DFloat_Type))

View File

@@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DId_Type;
#define BPy_UnaryFunction0DId_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DId_Type))

View File

@@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DMaterial_Type;
#define BPy_UnaryFunction0DMaterial_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DUnsigned_Type;
#define BPy_UnaryFunction0DUnsigned_Check(v) \

View File

@@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVec2f_Type;
#define BPy_UnaryFunction0DVec2f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec2f_Type))

View File

@@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVec3f_Type;
#define BPy_UnaryFunction0DVec3f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec3f_Type))

View File

@@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVectorViewShape_Type;
#define BPy_UnaryFunction0DVectorViewShape_Check(v) \

View File

@@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DViewShape_Type;
#define BPy_UnaryFunction0DViewShape_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ShapeIdF0D_Type;
#define BPy_ShapeIdF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ShapeIdF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject MaterialF0D_Type;
#define BPy_MaterialF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject CurveNatureF0D_Type;
#define BPy_CurveNatureF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Normal2DF0D_Type;
#define BPy_Normal2DF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Normal2DF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject VertexOrientation2DF0D_Type;
#define BPy_VertexOrientation2DF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject VertexOrientation3DF0D_Type;
#define BPy_VertexOrientation3DF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetOccludeeF0D_Type;
#define BPy_GetOccludeeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludeeF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetShapeF0D_Type;
#define BPy_GetShapeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetShapeF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Curvature2DAngleF0D_Type;
#define BPy_Curvature2DAngleF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Curvature2DAngleF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject DensityF0D_Type;
#define BPy_DensityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedXF0D_Type;
#define BPy_GetProjectedXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedXF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedYF0D_Type;
#define BPy_GetProjectedYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedYF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedZF0D_Type;
#define BPy_GetProjectedZF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedZF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetXF0D_Type;
#define BPy_GetXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetXF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetYF0D_Type;
#define BPy_GetYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetYF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetZF0D_Type;
#define BPy_GetZF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetZF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject LocalAverageDepthF0D_Type;
#define BPy_LocalAverageDepthF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&LocalAverageDepthF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ZDiscontinuityF0D_Type;
#define BPy_ZDiscontinuityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ZDiscontinuityF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetCurvilinearAbscissaF0D_Type;
#define BPy_GetCurvilinearAbscissaF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetParameterF0D_Type;
#define BPy_GetParameterF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetParameterF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetViewMapGradientNormF0D_Type;
#define BPy_GetViewMapGradientNormF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ReadCompleteViewMapPixelF0D_Type;
#define BPy_ReadCompleteViewMapPixelF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ReadMapPixelF0D_Type;
#define BPy_ReadMapPixelF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ReadMapPixelF0D_Type))

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ReadSteerableViewMapPixelF0D_Type;
#define BPy_ReadSteerableViewMapPixelF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject QuantitativeInvisibilityF0D_Type;
#define BPy_QuantitativeInvisibilityF0D_Check(v) \

View File

@@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetOccludersF0D_Type;
#define BPy_GetOccludersF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludersF0D_Type))