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).

12 files changed, 17 insertions, 35 deletions

diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index c4060e0897f..ba42b25b47e 100755
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -30,11 +30,11 @@
 #ifndef  FUNCTIONS1D_HPP
 # define FUNCTIONS1D_HPP
 
-# include "../system/Precision.h"
-# include "../system/TimeStamp.h"
 # include "ViewMap.h"
 # include "Functions0D.h"
 # include "Interface1D.h"
+# include "../system/Precision.h"
+# include "../system/TimeStamp.h"
 # include "../system/FreestyleConfig.h"
 
 #include "../python/Director.h"
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h
index 5108524cdd3..48d956eec19 100755
--- a/source/blender/freestyle/intern/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE0D_H
 # define INTERFACE0D_H
 
+# include <Python.h>
 # include <string>
 # include <iostream>
 # include "../system/Id.h"
@@ -40,16 +41,6 @@ using namespace std;
 
 #include "../system/Iterator.h" //soc 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 //
 // Interface0D
 //
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 17dee3973de..60cc0ebcb7e 100755
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE1D_H
 # define INTERFACE1D_H
 
+# include <Python.h>
 # include <string>
 # include <iostream>
 # include <float.h>
@@ -38,16 +39,6 @@
 # include "../winged_edge/Nature.h"
 # include "Functions0D.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 using namespace std;
 /*! \file Interface1D.h
  *  Interface1D and related tools definitions
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index a928eb87cc9..fc0bff9cbff 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -30,6 +30,8 @@
 #ifndef  SILHOUETTE_H
 # define SILHOUETTE_H
 
+# include "Interface0D.h"
+# include "Interface1D.h"
 # include <iostream>
 # include <string>
 # include <vector>
@@ -41,8 +43,6 @@
 # include "../scene_graph/FrsMaterial.h"
 # include "../geometry/Polygon.h"
 # include "../system/Exception.h"
-# include "Interface0D.h"
-# include "Interface1D.h"
 # include "../winged_edge/Curvature.h"
 
 using namespace std;
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index f91318101a0..c0817189bc2 100755
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SilhouetteGeomEngine.h"
 #include "Silhouette.h"
+#include "SilhouetteGeomEngine.h"
 #include "../geometry/GeomUtils.h"
 
 using namespace std;
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index 13c6bd65312..2c3a2cebadc 100755
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -18,10 +18,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Silhouette.h"
 #include "SteerableViewMap.h"
 #include "../image/ImagePyramid.h"
 #include "../image/Image.h"
-#include "Silhouette.h"
 #include <math.h>
 #include "../geometry/Geom.h"
 using namespace Geometry;
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 5f7b313aaf6..3e0979f684f 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -18,9 +18,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "ViewMap.h"
 #include "ViewEdgeXBuilder.h"
 #include "../winged_edge/WXEdge.h"
-#include "ViewMap.h"
 #include "SilhouetteGeomEngine.h"
 #include <list>
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 3f6be25312a..5a9d8f3b57b 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -30,12 +30,12 @@
 #ifndef  VIEWMAP_H
 # define VIEWMAP_H
 
-# include "../system/BaseIterator.h"
-# include "../system/FreestyleConfig.h"
-# include "../geometry/GeomUtils.h"
 # include "Interface0D.h"
 # include "Interface1D.h"
 # include "Silhouette.h" // defines the embedding
+# include "../system/BaseIterator.h"
+# include "../system/FreestyleConfig.h"
+# include "../geometry/GeomUtils.h"
 # include <map>
 
                   /**********************************/
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 96635517747..7e582e7f037 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <algorithm>
 #include "ViewMapBuilder.h"
+#include <algorithm>
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
index aad9aa245b7..12b1266fa12 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
@@ -31,12 +31,12 @@
 #ifndef  VIEWMAPBUILDER_H
 # define VIEWMAPBUILDER_H
 
+# include "Silhouette.h"
 # include <vector>
 # include "../system/FreestyleConfig.h"
 # include "../geometry/Geom.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../winged_edge/WXEdge.h"
-# include "Silhouette.h"
 # include "../geometry/GeomUtils.h"
 # include "../geometry/Grid.h"
 # include "../system/ProgressBar.h"
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h
index 33e168b537b..185841a90ec 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h
@@ -30,11 +30,11 @@
 #ifndef  VIEWMAPIO_H
 # define VIEWMAPIO_H
 
+# include "ViewMap.h"
 # include <fstream>
 # include <string>
 # include "../system/FreestyleConfig.h"
 # include "../system/ProgressBar.h"
-# include "ViewMap.h"
 
 namespace ViewMapIO {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index 630bfa561f2..0177dc630b8 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -31,10 +31,10 @@
 #ifndef  VIEWMAPTESSELATOR_H
 # define VIEWMAPTESSELATOR_H
 
-# include "../scene_graph/NodeShape.h"
-# include "../winged_edge/WEdge.h"
 # include "Silhouette.h"
 # include "ViewMap.h"
+# include "../scene_graph/NodeShape.h"
+# include "../winged_edge/WEdge.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../scene_graph/LineRep.h"
 # include "../scene_graph/OrientedLineRep.h"