From 535f6a13b367d2a561cc5c221776906ab318cf99 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 21 Mar 2000 20:38:52 +0000
Subject: [PATCH] Fixes for MSVC++.

---
 simgear/metar/MetarReport.h    | 4 ++--
 simgear/metar/MetarStation.cpp | 2 +-
 simgear/metar/MetarStation.h   | 4 ++--
 simgear/misc/texcoord.cxx      | 6 ++++--
 simgear/screen/GLBitmaps.cxx   | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/simgear/metar/MetarReport.h b/simgear/metar/MetarReport.h
index 06e09808..36c53c4b 100644
--- a/simgear/metar/MetarReport.h
+++ b/simgear/metar/MetarReport.h
@@ -10,8 +10,8 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 
 class CMetarReport
 {
diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index 451204cc..e5067923 100644
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -9,7 +9,7 @@
 // options is too tightly integrated into FlightGear to use in a test program
 #include <Main/options.hxx>
 #endif
-#include <Misc/fgpath.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 
 std::vector< CMetarStation *> METAR_Stations;
diff --git a/simgear/metar/MetarStation.h b/simgear/metar/MetarStation.h
index 299e5e17..8169a9c9 100644
--- a/simgear/metar/MetarStation.h
+++ b/simgear/metar/MetarStation.h
@@ -11,8 +11,8 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 //using namespace std;
 
 class CMetarStation
diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index 61efc23e..789fd9d9 100644
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -80,7 +80,9 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
     Point3D tmin, tmax, p, t;
     bool first = true;
 
-    for ( int i = 0; i < (int)fan.size(); ++i ) {
+    int i;
+
+    for ( i = 0; i < (int)fan.size(); ++i ) {
 	p = geod_nodes[ fan[i] ];
 	// cout << "point p = " << p << endl;
 
@@ -162,7 +164,7 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
     Point3D adjusted_t;
     point_list tex;
     tex.clear();
-    for ( int i = 0; i < (int)fan.size(); ++i ) {
+    for ( i = 0; i < (int)fan.size(); ++i ) {
 	p = geod_nodes[ fan[i] ];
 	t = basic_tex_coord( p, degree_width, degree_height, scale );
 	// cout << "second t = " << t << endl;
diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index eef3e7ad..0edadf41 100755
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <string.h>		// memcpy()
 
 #include <GL/glut.h>
 #include <simgear/xgl/xgl.h>
-- 
2.39.5