From 7ed7524c91a07756466cc235d476daf0c7100b72 Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
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/application/AppCanvas.cpp | 3 +--
 source/blender/freestyle/intern/application/AppView.cpp   | 3 ++-
 source/blender/freestyle/intern/application/Controller.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/blender/freestyle/intern/application')

diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index 986830292c9..3844cf2195a 100755
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -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"
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp
index 886fa31bc93..e523a89b445 100644
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Controller.h"
+
 extern "C" {
 #include "BLI_jitter.h"
 }
@@ -27,7 +29,6 @@ extern "C" {
 #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"
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index deeabb6da0a..422707d3c1f 100755
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -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"
-- 
cgit v1.2.3