Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-08 03:28:29 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-08 03:28:29 +0400
commit7ed7524c91a07756466cc235d476daf0c7100b72 (patch)
treeac2dba733bec9c9e47da957bb0f8abec838f67a0 /source/blender/freestyle/intern/python
parentf85bcac8ae73f763bce29916a616b9b713d984b8 (diff)
Got rid of a number of compiler warnings with regard to redefinitions
of _POSIX_C_SOURCE and _XOPEN_SOURCE. There are no functional changes. Tested with GCC 4.4.1 on Ubuntu 9.10 (karmic).
Diffstat (limited to 'source/blender/freestyle/intern/python')
-rw-r--r--source/blender/freestyle/intern/python/BPy_BBox.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_ContextFunctions.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Convert.h2
-rw-r--r--source/blender/freestyle/intern/python/BPy_Freestyle.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_FrsMaterial.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_FrsNoise.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Id.h3
-rw-r--r--source/blender/freestyle/intern/python/BPy_IntegrationType.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Interface0D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Interface1D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Iterator.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_MediumType.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Nature.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_Operators.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_SShape.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_StrokeAttribute.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_StrokeShader.h3
-rw-r--r--source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_ViewMap.h4
-rw-r--r--source/blender/freestyle/intern/python/BPy_ViewShape.h4
25 files changed, 47 insertions, 49 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 96a61e18c2f..f8282187da0 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_BBOX_H
#define FREESTYLE_PYTHON_BBOX_H
+#include <Python.h>
+
#include "../geometry/BBox.h"
#include "../geometry/Geom.h"
using namespace Geometry;
@@ -11,8 +13,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject BBox_Type;
#define BPy_BBox_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index d27b6cc0fe8..6a9a0775608 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
#define FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+#include <Python.h>
+
#include "../stroke/Predicates0D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject BinaryPredicate0D_Type;
#define BPy_BinaryPredicate0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 42419ce7129..5a993f84f5b 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
#define FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+#include <Python.h>
+
#include "../stroke/Predicates1D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject BinaryPredicate1D_Type;
#define BPy_BinaryPredicate1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
index 5ec70f1a261..fafeff3e974 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -1,12 +1,12 @@
#ifndef FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
#define FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
+#include <Python.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-#include <Python.h>
-
/*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/
int ContextFunctions_Init( PyObject *module );
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 3c0ada2ce76..1e861e23c78 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -1,6 +1,7 @@
#ifndef FREESTYLE_PYTHON_CONVERT_H
#define FREESTYLE_PYTHON_CONVERT_H
+#include <Python.h>
#include <typeinfo>
#include "../geometry/Geom.h"
@@ -61,7 +62,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
#include "generic/Mathutils.h"
//==============================
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index 4a280cee5af..8ade4b5ff4d 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -1,14 +1,14 @@
#ifndef FREESTYLE_PYTHON_FREESTYLE_H
#define FREESTYLE_PYTHON_FREESTYLE_H
+#include <Python.h>
+
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
/*---------------------------Python BPy_Freestyle visible prototypes-----------*/
PyObject *Freestyle_Init( void );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index 01bdabc09d9..f541e1bb529 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
#define FREESTYLE_PYTHON_FRSMATERIAL_H
+#include <Python.h>
+
#include "../scene_graph/FrsMaterial.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject FrsMaterial_Type;
#define BPy_FrsMaterial_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
index 9b06ea0c37d..00b4f3375bc 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_FRSNOISE_H
#define FREESTYLE_PYTHON_FRSNOISE_H
+#include <Python.h>
+
#include "../geometry/Noise.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject FrsNoise_Type;
#define BPy_FrsNoise_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index 3063334f075..10f370f8a80 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -1,6 +1,7 @@
#ifndef FREESTYLE_PYTHON_ID_H
#define FREESTYLE_PYTHON_ID_H
+#include <Python.h>
#include <iostream>
using namespace std;
@@ -12,8 +13,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Id_Type;
#define BPy_Id_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
index 176d8750c45..f15ae8309e3 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H
#define FREESTYLE_PYTHON_INTEGRATIONTYPE_H
+#include <Python.h>
+
#include "../view_map/Interface1D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject IntegrationType_Type;
#define BPy_IntegrationType_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
index cd8a8e19749..25134db5352 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_INTERFACE0D_H
#define FREESTYLE_PYTHON_INTERFACE0D_H
+#include <Python.h>
+
#include "../view_map/Interface0D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Interface0D_Type;
#define BPy_Interface0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
index f82b80e20eb..75eefa1836f 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_INTERFACE1D_H
#define FREESTYLE_PYTHON_INTERFACE1D_H
+#include <Python.h>
+
#include "../view_map/Interface1D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Interface1D_Type;
#define BPy_Interface1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
index 162df60d91e..0bdb52ef9a5 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_ITERATOR_H
#define FREESTYLE_PYTHON_ITERATOR_H
+#include <Python.h>
+
#include "../system/Iterator.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Iterator_Type;
#define BPy_Iterator_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
index 94bc7aa954c..3bc50477295 100644
--- a/source/blender/freestyle/intern/python/BPy_MediumType.h
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H
#define FREESTYLE_PYTHON_MEDIUMTYPE_H
+#include <Python.h>
+
#include "../stroke/Stroke.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject MediumType_Type;
#define BPy_MediumType_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
index d5e1c9c63d4..8c38415242e 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.h
+++ b/source/blender/freestyle/intern/python/BPy_Nature.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_NATURE_H
#define FREESTYLE_PYTHON_NATURE_H
+#include <Python.h>
+
#include "../winged_edge/Nature.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Nature_Type;
#define BPy_Nature_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h
index c6b088415c4..5e01d6bb1fe 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.h
+++ b/source/blender/freestyle/intern/python/BPy_Operators.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_OPERATORS_H
#define FREESTYLE_PYTHON_OPERATORS_H
+#include <Python.h>
+
#include "../stroke/Operators.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject Operators_Type;
#define BPy_Operators_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
index 3bcb6a60603..e8d631f0538 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_SSHAPE_H
#define FREESTYLE_PYTHON_SSHAPE_H
+#include <Python.h>
+
#include "../view_map/Silhouette.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject SShape_Type;
#define BPy_SShape_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
index a2193c681aa..51e18c0a96f 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H
#define FREESTYLE_PYTHON_STROKEATTRIBUTE_H
+#include <Python.h>
+
#include "../stroke/Stroke.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject StrokeAttribute_Type;
#define BPy_StrokeAttribute_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
index e1d72cef546..baa31a3100e 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -1,6 +1,7 @@
#ifndef FREESTYLE_PYTHON_STROKESHADER_H
#define FREESTYLE_PYTHON_STROKESHADER_H
+#include <Python.h>
#include "../system/FreestyleConfig.h"
@@ -14,8 +15,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject StrokeShader_Type;
#define BPy_StrokeShader_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index d9215e3275f..6d61c336662 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
#define FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+#include <Python.h>
+
#include "../view_map/Functions0D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject UnaryFunction0D_Type;
#define BPy_UnaryFunction0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index b8d92ba649d..cb9df18ab75 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H
#define FREESTYLE_PYTHON_UNARYFUNCTION1D_H
+#include <Python.h>
+
#include "../view_map/Functions1D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject UnaryFunction1D_Type;
#define BPy_UnaryFunction1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
index a3b56d39594..9f9bb0c1003 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H
#define FREESTYLE_PYTHON_UNARYPREDICATE0D_H
+#include <Python.h>
+
#include "../stroke/Predicates0D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject UnaryPredicate0D_Type;
#define BPy_UnaryPredicate0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index f23b2e0d25f..75953e7977b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H
#define FREESTYLE_PYTHON_UNARYPREDICATE1D_H
+#include <Python.h>
+
#include "../stroke/Predicates1D.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject UnaryPredicate1D_Type;
#define BPy_UnaryPredicate1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
index f1966e5c71e..943aeb718fc 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_VIEWMAP_H
#define FREESTYLE_PYTHON_VIEWMAP_H
+#include <Python.h>
+
#include "../view_map/ViewMap.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject ViewMap_Type;
#define BPy_ViewMap_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type) )
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
index e88ab090b47..1850ec8f13a 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -1,6 +1,8 @@
#ifndef FREESTYLE_PYTHON_VIEWSHAPE_H
#define FREESTYLE_PYTHON_VIEWSHAPE_H
+#include <Python.h>
+
#include "../view_map/ViewMap.h"
#ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
-#include <Python.h>
-
extern PyTypeObject ViewShape_Type;
#define BPy_ViewShape_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type) )