From 3ffe7de6a3d4469ad7d80f656ddd2cf8d6c65a31 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 20 Dec 2007 10:48:23 +0000
Subject: [PATCH] Reorder includes in an attempt to avoid compile problems
 under Cygwin.

---
 src/osgPlugins/cfg/Camera.h         | 6 ++----
 src/osgPlugins/cfg/CameraConfig.cpp | 9 +++++----
 src/osgPlugins/cfg/CameraConfig.h   | 5 +++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/osgPlugins/cfg/Camera.h b/src/osgPlugins/cfg/Camera.h
index 2c9f1ef86..ee9804a0e 100644
--- a/src/osgPlugins/cfg/Camera.h
+++ b/src/osgPlugins/cfg/Camera.h
@@ -14,15 +14,13 @@
 #ifndef OSGPRODUCER_CAMERA
 #define OSGPRODUCER_CAMERA
 
-#include "RenderSurface.h"
 #include <osg/Referenced>
 #include <osg/Matrix>
-#include <osg/Math>
 #include <osg/Vec3>
 
-#include <vector>
+#include "RenderSurface.h"
 
-#include <osg/Math>
+#include <vector>
 
 namespace osgProducer {
 
diff --git a/src/osgPlugins/cfg/CameraConfig.cpp b/src/osgPlugins/cfg/CameraConfig.cpp
index 15379547c..39718a59a 100644
--- a/src/osgPlugins/cfg/CameraConfig.cpp
+++ b/src/osgPlugins/cfg/CameraConfig.cpp
@@ -11,6 +11,9 @@
  * OpenSceneGraph Public License for more details.
  */
 
+#include <osg/Notify>
+#include <osg/ref_ptr>
+#include <osg/io_utils>
 
 #if defined(WIN32) && !defined(__CYGWIN__)
     #include <Io.h>
@@ -30,11 +33,9 @@
 #include <memory.h>
 #include <stdlib.h>
 #include <iostream>
-#include <cmath>
+
 #include "CameraConfig.h"
-#include <osg/Notify>
-#include <osg/ref_ptr>
-#include <osg/io_utils>
+
 
 using namespace osgProducer;
 
diff --git a/src/osgPlugins/cfg/CameraConfig.h b/src/osgPlugins/cfg/CameraConfig.h
index 4ee6f0c4f..050847c0c 100644
--- a/src/osgPlugins/cfg/CameraConfig.h
+++ b/src/osgPlugins/cfg/CameraConfig.h
@@ -16,8 +16,6 @@
 
 #include <stdio.h>
 
-#include "Camera.h"
-#include "RenderSurface.h"
 #include <osg/Referenced>
 #include <osg/Matrix>
 #include <osgViewer/View>
@@ -29,6 +27,9 @@
 #include <osg/Vec2>
 #include <iostream>
 
+#include "Camera.h"
+#include "RenderSurface.h"
+
 //#undef SUPPORT_CPP
 
 namespace osgProducer {