From 7ed7524c91a07756466cc235d476daf0c7100b72 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 7 Apr 2010 23:28:29 +0000 Subject: 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). --- source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h | 2 +- source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp | 2 +- source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp | 2 +- source/blender/freestyle/intern/stroke/Canvas.cpp | 2 +- source/blender/freestyle/intern/stroke/ChainingIterators.h | 2 +- source/blender/freestyle/intern/stroke/Curve.h | 2 +- source/blender/freestyle/intern/stroke/Operators.cpp | 2 +- source/blender/freestyle/intern/stroke/Operators.h | 2 +- source/blender/freestyle/intern/stroke/PSStrokeRenderer.h | 2 +- source/blender/freestyle/intern/stroke/Stroke.h | 2 +- source/blender/freestyle/intern/stroke/StrokeIO.h | 2 +- source/blender/freestyle/intern/stroke/StrokeLayer.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeRenderer.h | 2 +- source/blender/freestyle/intern/stroke/StrokeRep.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeTesselator.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeTesselator.h | 2 +- source/blender/freestyle/intern/stroke/TextStrokeRenderer.h | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source/blender/freestyle/intern/stroke') diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index 46a28c20917..ab963c68034 100755 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -31,8 +31,8 @@ # define ADVANCED_FUNCTIONS1D_HPP -# include "AdvancedFunctions0D.h" # include "../view_map/Functions1D.h" +# include "AdvancedFunctions0D.h" // // Functions definitions diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp index 2075f7ca6ad..05da47914f3 100755 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "AdvancedStrokeShaders.h" #include "../system/PseudoNoise.h" #include "../system/RandGen.h" -#include "AdvancedStrokeShaders.h" #include "StrokeIterators.h" ///////////////////////////////////////// diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 828c13338ae..bc9edcef057 100755 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -19,6 +19,7 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeRenderer.h" #include #include "BasicStrokeShaders.h" #include "../system/PseudoNoise.h" @@ -29,7 +30,6 @@ #include "AdvancedFunctions1D.h" #include "StrokeIterators.h" #include "../system/StringUtils.h" -#include "StrokeRenderer.h" #include "StrokeIO.h" //soc #include diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 7be2b54a036..c1843b7a6c1 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeRenderer.h" #include #include "../system/FreestyleConfig.h" -#include "StrokeRenderer.h" #include "../system/TimeStamp.h" #include "../system/PseudoNoise.h" #include "Canvas.h" diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index ec093888aea..fec8d5ab6dc 100755 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -28,10 +28,10 @@ #ifndef CHAININGITERATORS_H # define CHAININGITERATORS_H -# include # include "../view_map/ViewMap.h" # include "../view_map/ViewMapIterators.h" # include "../view_map/ViewMapAdvancedIterators.h" +# include # include "Predicates1D.h" #include "../system/Iterator.h" //soc diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 52a0dda1f17..60bc9815cb4 100755 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -30,11 +30,11 @@ #ifndef CURVE_H # define CURVE_H +# include "../view_map/Silhouette.h" # include # include "../system/BaseIterator.h" # include "../geometry/Geom.h" //# include "../scene_graph/FrsMaterial.h" -# include "../view_map/Silhouette.h" # include "../view_map/SilhouetteGeomEngine.h" # include "../view_map/Interface0D.h" # include "../view_map/Interface1D.h" diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 950c9570f0e..ef1b2662998 100755 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "Operators.h" #include #include -#include "Operators.h" #include "Canvas.h" #include "Stroke.h" diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index cff9e120c1a..d705d5af5b2 100755 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -30,9 +30,9 @@ #ifndef OPERATORS_H # define OPERATORS_H +# include "../view_map/Interface1D.h" # include # include -# include "../view_map/Interface1D.h" # include "Predicates1D.h" # include "Predicates0D.h" # include "../view_map/ViewMap.h" diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h index 821c016ab91..b30949845ab 100755 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h @@ -30,8 +30,8 @@ #ifndef PSSTROKERENDERER_H # define PSSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "StrokeRenderer.h" +# include "../system/FreestyleConfig.h" # include /**********************************/ diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 796b5dc9e2d..5e0974edea7 100755 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -30,10 +30,10 @@ #ifndef STROKE_H # define STROKE_H +# include "../view_map/Silhouette.h" # include # include # include "../system/FreestyleConfig.h" -# include "../view_map/Silhouette.h" # include "Curve.h" # include "../view_map/Interface1D.h" # include "../system/StringUtils.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index c99704c3b37..150c8340778 100755 --- a/source/blender/freestyle/intern/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h @@ -30,9 +30,9 @@ #ifndef STROKEIO_H # define STROKEIO_H +# include "Stroke.h" # include # include "../system/FreestyleConfig.h" -# include "Stroke.h" LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute); diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp index 8b469399ca8..d5fc27d3d73 100755 --- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "StrokeLayer.h" #include "Stroke.h" +#include "StrokeLayer.h" #include "Canvas.h" StrokeLayer::~StrokeLayer() diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 339e401aa41..c7c6df635d5 100755 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -30,11 +30,11 @@ #ifndef STROKE_RENDERER_H # define STROKE_RENDERER_H +# include "Stroke.h" # include # include # include # include "../system/FreestyleConfig.h" -# include "Stroke.h" # include "StrokeRep.h" # include diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 51a1c8cfd4d..fbe1273bac0 100755 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "StrokeRep.h" #include "Stroke.h" +#include "StrokeRep.h" #include "StrokeRenderer.h" #include "StrokeAdvancedIterators.h" #include "StrokeIterators.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp index 465e5662774..a8b71f9f3c3 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp @@ -19,10 +19,10 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeTesselator.h" #include "../scene_graph/OrientedLineRep.h" #include "../scene_graph/NodeGroup.h" #include "../scene_graph/NodeShape.h" -#include "StrokeTesselator.h" #include "StrokeAdvancedIterators.h" LineRep* StrokeTesselator::Tesselate(Stroke *iStroke) diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index 1de281734cd..671df00ef84 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -31,8 +31,8 @@ #ifndef STROKETESSELATOR_H # define STROKETESSELATOR_H -# include "../scene_graph/LineRep.h" # include "Stroke.h" +# include "../scene_graph/LineRep.h" class StrokeTesselator { diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index ef610d63bdd..8b4b6bc80d7 100755 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -35,8 +35,8 @@ #ifndef TEXTSTROKERENDERER_H # define TEXTSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "StrokeRenderer.h" +# include "../system/FreestyleConfig.h" # include /**********************************/ -- cgit v1.2.3