Tweaks for building with native SGI compilers.

[flightgear.git] / Scenery / tile.hxx

diff --git a/Scenery/tile.hxx b/Scenery/tile.hxx
index c3a2c12375e3f488f47eb6ad514efbee143d5e75..46240a9106232222a017481079d46075c58ada39 100644 (file)
--- a/Scenery/tile.hxx
+++ b/Scenery/tile.hxx
@@ -41,21 +41,22 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <vector>
-#include <string>
+#include <Include/compiler.h>
 
-#include "Include/compiler.h"
-#include STL_FUNCTIONAL
-#include STL_ALGORITHM
-FG_USING_NAMESPACE(std);
-// FG_USING_STD(string);
-// FG_USING_STD(vector);
+#include <vector>
+#include STL_STRING
 
 #include <Bucket/bucketutils.h>
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 #include <Objects/fragment.hxx>
 
+FG_USING_STD(string);
+FG_USING_STD(vector);
+
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#include <strings.h>
+#endif
 
 // Scenery tile class
 class fgTILE {
@@ -127,9 +128,9 @@ public:
     UpdateViewMatrix(GLdouble *MODEL_VIEW)
     {
 
-#ifdef WIN32
+#if defined( USE_MEM ) || defined( WIN32 )
        memcpy( model_view, MODEL_VIEW, 16*sizeof(GLdouble) );
-#else
+#else 
        bcopy( MODEL_VIEW, model_view, 16*sizeof(GLdouble) );
 #endif
        
@@ -160,6 +161,33 @@ private:
 
 
 // $Log$
+// Revision 1.25  1999/03/02 01:03:30  curt
+// Tweaks for building with native SGI compilers.
+//
+// Revision 1.24  1999/02/26 22:10:02  curt
+// Added initial support for native SGI compilers.
+//
+// Revision 1.23  1999/02/02 20:13:41  curt
+// MSVC++ portability changes by Bernie Bright:
+//
+// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
+// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
+// Simulator/Cockpit/hud.cxx: Added Standard headers
+// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
+// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG.  Deleted <stdio.h>
+// Simulator/Main/fg_init.cxx:
+// Simulator/Main/GLUTmain.cxx:
+// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
+// Simulator/Objects/material.hxx:
+// Simulator/Time/timestamp.hxx: VC++ friend kludge
+// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
+// Simulator/Main/views.hxx: Added a constant
+//
+// Revision 1.22  1998/12/03 01:18:16  curt
+// Converted fgFLIGHT to a class.
+// Tweaks for Sun Portability.
+// Tweaked current terrain elevation code as per NHV.
+//
 // Revision 1.21  1998/11/09 23:40:47  curt
 // Bernie Bright <bbright@c031.aone.net.au> writes:
 // I've made some changes to the Scenery handling.  Basically just tidy ups.