From 0a4cc36775577ebdd3b7c5221c6526ad92c3275c Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 27 Aug 2003 14:02:29 +0000
Subject: [PATCH] Use <simgear/compiler.h> functionality to make STL includes
 more portable.

---
 src/Prep/Terra/Mask.h    |  4 +++-
 src/Prep/Terra/gui.cc    |  6 +++---
 src/Prep/Terra/output.cc | 21 ++++++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Prep/Terra/Mask.h b/src/Prep/Terra/Mask.h
index b964bf8c..2160ee2e 100644
--- a/src/Prep/Terra/Mask.h
+++ b/src/Prep/Terra/Mask.h
@@ -1,7 +1,9 @@
 #ifndef MASK_INCLUDED // -*- C++ -*-
 #define MASK_INCLUDED
 
-#include <istream>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
 using std::istream;
 
diff --git a/src/Prep/Terra/gui.cc b/src/Prep/Terra/gui.cc
index 76550f8c..01b4f02b 100644
--- a/src/Prep/Terra/gui.cc
+++ b/src/Prep/Terra/gui.cc
@@ -101,8 +101,8 @@ static void draw_dem()
 {
     Map *bits = DEM;
 
-    glPixelZoom((float)glutGet(GLUT_WINDOW_WIDTH) / (float)DEM->width ,
-		-(float)glutGet(GLUT_WINDOW_HEIGHT) / (float)DEM->height);
+    glPixelZoom((float)glutGet((GLenum)GLUT_WINDOW_WIDTH) / (float)DEM->width ,
+		-(float)glutGet((GLenum)GLUT_WINDOW_HEIGHT) / (float)DEM->height);
     glRasterPos3f(0, 0, 0);
 
 
@@ -160,7 +160,7 @@ void mesh_mouse(int button, int state, int x, int y)
 	if( button == GLUT_LEFT_BUTTON )
 	{
 	    GLdouble u, v, z;
-	    int win_height = glutGet(GLUT_WINDOW_HEIGHT);
+	    int win_height = glutGet((GLenum)GLUT_WINDOW_HEIGHT);
 
 	    glUnproject(x, win_height-y, 0, &u, &v, &z);
 	    if( u<0 ) u = 0;
diff --git a/src/Prep/Terra/output.cc b/src/Prep/Terra/output.cc
index adf4ed7f..23206789 100644
--- a/src/Prep/Terra/output.cc
+++ b/src/Prep/Terra/output.cc
@@ -1,14 +1,17 @@
-#include "terra.h"
-#include <fstream>
+#include <simgear/compiler.h>
+
+#include STL_FSTREAM
 #include <streambuf>
 
-using std::cerr;
-using std::cout;
-using std::endl;
-using std::istream;
-using std::ostream;
-using std::ofstream;
-using std::streampos;
+#include "terra.h"
+
+SG_USING_STD(cerr);
+SG_USING_STD(cout);
+SG_USING_STD(endl);
+SG_USING_STD(istream);
+SG_USING_STD(ostream);
+SG_USING_STD(ofstream);
+SG_USING_STD(streampos);
 
 
 void generate_output(char *filename, FileFormat format)