[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28081] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: Got rid of a number of compiler warnings with regard to redefinitions

Thu Apr 8 01:28:29 CEST 2010

Revision: 28081
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28081
Author:   kjym3
Date:     2010-04-08 01:28:29 +0200 (Thu, 08 Apr 2010)

Log Message:
-----------
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).

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Id.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_IntegrationType.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_MediumType.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Nature.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Operators.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ViewMap.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ViewShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/ChainingIterators.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Stroke.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeIO.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeTesselator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PythonInterpreter.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Interface0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Interface1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Silhouette.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMap.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapIO.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapTesselator.h

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.cpp
===================================================================

--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.cpp	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.cpp	2010-04-07 23:28:29 UTC (rev 28081)
@@ -19,12 +19,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Controller.h"
 #include "../rendering/GLBlendEquation.h"
-
 #include "AppView.h"
 #include "../image/Image.h"
 #include "../system/TimeStamp.h"
-#include "Controller.h"
 #include "../stroke/StrokeRenderer.h"
 #include "AppCanvas.h"
 #include "../rendering/GLRenderer.h"

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp	2010-04-07 23:28:29 UTC (rev 28081)
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Controller.h"
+
 extern "C" {
 #include "BLI_jitter.h"
 }
@@ -27,7 +29,6 @@
 #include "../stroke/Canvas.h"
 #include "AppView.h"
 #include "../scene_graph/NodeLight.h"
-#include "Controller.h"
 #include "../view_map/Silhouette.h"
 #include "../view_map/ViewMap.h"
 #include "../scene_graph/LineRep.h"

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -30,11 +30,11 @@
 #ifndef  CONTROLLER_H
 # define CONTROLLER_H
 
+# include "../view_map/ViewMapBuilder.h"
 # include <string>
 //# include "ConfigIO.h"
 # include "../geometry/FastGrid.h"
 # include "../geometry/HashGrid.h"
-# include "../view_map/ViewMapBuilder.h"
 # include "../system/TimeUtils.h"
 # include "../system/ProgressBar.h"
 # include "../system/Precision.h"

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -1,8 +1,8 @@
 #ifndef  BLENDERSTROKERENDERER_H
 # define BLENDERSTROKERENDERER_H
 
+# include "../stroke/StrokeRenderer.h"
 # include "../system/FreestyleConfig.h"
-# include "../stroke/StrokeRenderer.h"
 
 #ifdef __cplusplus
 extern "C" {

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -1,9 +1,9 @@
 #ifndef  BLENDERTEXTUREMANAGER_H
 #define BLENDERTEXTUREMANAGER_H
 
-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
 # include "../stroke/StrokeRep.h"
+# include "../system/FreestyleConfig.h"
 
 /*! Class to load textures
  */

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2010-04-07 23:28:29 UTC (rev 28081)
@@ -1,5 +1,5 @@
+#include "../application/Controller.h"
 #include "../application/AppView.h"
-#include "../application/Controller.h"
 #include "../application/AppConfig.h"
 #include "../application/AppCanvas.h"
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BBox_Type;
 
 #define BPy_BBox_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type)  )

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate0D_Type;
 
 #define BPy_BinaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type)  )

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate1D_Type;
 
 #define BPy_BinaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type)  )

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ContextFunctions.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ContextFunctions.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 );

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
 #include "generic/Mathutils.h"
 
 //==============================

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 );

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h	2010-04-07 20:24:08 UTC (rev 28080)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h	2010-04-07 23:28:29 UTC (rev 28081)
@@ -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 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject FrsMaterial_Type;
 
 #define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )


@@ Diff output truncated at 10240 characters. @@


