From 816df3a1d07195f762ac87b4637934c1ad1aa8d0 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 4 Apr 2005 12:24:18 +0000
Subject: [PATCH] Fixes for VS6.0 build

---
 src/osgPlugins/net/sockstream.h  | 1 +
 src/osgPlugins/osg/ProxyNode.cpp | 9 +++++----
 src/osgText/Text.cpp             | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/osgPlugins/net/sockstream.h b/src/osgPlugins/net/sockstream.h
index 4e13a4eb6..fd0415af0 100644
--- a/src/osgPlugins/net/sockstream.h
+++ b/src/osgPlugins/net/sockstream.h
@@ -49,6 +49,7 @@
 #else
 #  include <windows.h>
 #  include <Wininet.h>
+//#  include <errno.h>
 #ifdef _MSC_VER 
 #  pragma comment(lib, "Wininet")
 #endif
diff --git a/src/osgPlugins/osg/ProxyNode.cpp b/src/osgPlugins/osg/ProxyNode.cpp
index a4af311cb..9e904ab55 100644
--- a/src/osgPlugins/osg/ProxyNode.cpp
+++ b/src/osgPlugins/osg/ProxyNode.cpp
@@ -100,16 +100,17 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
 
     }
 
-    int num_children;
+    unsigned int num_children;
     if (fr[0].matchWord("num_children") &&
-        fr[1].getInt(num_children))
+        fr[1].getUInt(num_children))
     {
         // could allocate space for children here...
         fr+=2;
         iteratorAdvanced = true;
     }
 
-    for(int i=0; i<num_children; i++)
+    unsigned int i;
+    for(i=0; i<num_children; i++)
     {
         osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)fr.getOptions())->getDatabasePathList();
         fpl.push_front( fpl.empty() ? osgDB::getFilePath(proxyNode.getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(proxyNode.getFileName(i)));
@@ -122,7 +123,7 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
         fpl.pop_front();
     }
 
-    for(unsigned int i=0; i<proxyNode.getNumFileNames(); i++)
+    for(i=0; i<proxyNode.getNumFileNames(); i++)
     {
         if(i>=proxyNode.getNumChildren() && !proxyNode.getFileName(i).empty())
         {
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index e1d228aff..45ee11a68 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -566,7 +566,8 @@ void Text::computeGlyphRepresentation()
 
         // osg::notify(osg::NOTICE)<<"lineNumber="<<lineNumber<<std::endl;
 
-        for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
+        TextureGlyphQuadMap::iterator titr;
+        for(titr=_textureGlyphQuadMap.begin();
             titr!=_textureGlyphQuadMap.end();
             ++titr)
         {
@@ -646,7 +647,7 @@ void Text::computeGlyphRepresentation()
         }
 
         // shift lines
-        for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin();
+        for(titr=_textureGlyphQuadMap.begin();
             titr!=_textureGlyphQuadMap.end();
             ++titr)
         {