From aca7f7b21654ef70b11f58560e4399418eca5daf Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 9 Jul 2002 10:23:48 +0000
Subject: [PATCH] Fixes for IRIX build.

---
 src/Demos/osgcluster/broadcaster.cpp        | 5 ++++-
 src/osgPlugins/osg/Geometry.cpp             | 4 ++--
 src/osgPlugins/pfb/ConvertFromPerformer.cpp | 4 ++--
 src/osgPlugins/pfb/ConvertFromPerformer.h   | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Demos/osgcluster/broadcaster.cpp b/src/Demos/osgcluster/broadcaster.cpp
index 2ea0146b8..4605265b7 100644
--- a/src/Demos/osgcluster/broadcaster.cpp
+++ b/src/Demos/osgcluster/broadcaster.cpp
@@ -20,16 +20,19 @@
     #include <unistd.h>
     #include <linux/sockios.h>
 #elif defined(__FreeBSD__)
+    #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined(__sgi)
+    #include <unistd.h>
     #include <net/soioctl.h>
 #elif defined(__CYGWIN__) 
     // nothing needed
 #elif defined(__sun) 
+    #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined (__DARWIN_OSX__)
-    #include <sys/sockio.h>
     #include <unistd.h>
+    #include <sys/sockio.h>
 #elif defined (WIN32)
     #include <winsock.h>
     #include <stdio.h>
diff --git a/src/osgPlugins/osg/Geometry.cpp b/src/osgPlugins/osg/Geometry.cpp
index 591769a28..4fc34a285 100644
--- a/src/osgPlugins/osg/Geometry.cpp
+++ b/src/osgPlugins/osg/Geometry.cpp
@@ -153,7 +153,7 @@ bool Geometry_readLocalData(Object& obj, Input& fr)
         if (colors)
         {
             geom.setColorArray(colors);
-            iteratorAdvanced++;
+            iteratorAdvanced = true;
         }
     }
 
@@ -167,7 +167,7 @@ bool Geometry_readLocalData(Object& obj, Input& fr)
         if (texcoords)
         {
             geom.setTexCoordArray(unit,texcoords);
-            iteratorAdvanced++;
+            iteratorAdvanced = true;
         }
         
     }
diff --git a/src/osgPlugins/pfb/ConvertFromPerformer.cpp b/src/osgPlugins/pfb/ConvertFromPerformer.cpp
index 451bd0a54..9a9614290 100644
--- a/src/osgPlugins/pfb/ConvertFromPerformer.cpp
+++ b/src/osgPlugins/pfb/ConvertFromPerformer.cpp
@@ -718,7 +718,7 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
 }
 
 
-osg::StateSet* ConvertFromPerformer::visitGeoState(osg:Drawable* osgDrawable,pfGeoState* geostate)
+osg::StateSet* ConvertFromPerformer::visitGeoState(osg::Drawable* osgDrawable,pfGeoState* geostate)
 {
     if (geostate==NULL) return NULL;
 
@@ -732,7 +732,7 @@ osg::StateSet* ConvertFromPerformer::visitGeoState(osg:Drawable* osgDrawable,pfG
     osgStateSet = new osg::StateSet;
     if (osgDrawable) osgDrawable->setStateSet(osgStateSet);
 
-    regisiterPfObjectForOsgObject(geostate,osgStateSet);
+    registerPfObjectForOsgObject(geostate,osgStateSet);
 
     // Don could you fill in some of these blanks???
     unsigned int inherit = geostate->getInherit();
diff --git a/src/osgPlugins/pfb/ConvertFromPerformer.h b/src/osgPlugins/pfb/ConvertFromPerformer.h
index 6af954bdc..91b3f1c84 100644
--- a/src/osgPlugins/pfb/ConvertFromPerformer.h
+++ b/src/osgPlugins/pfb/ConvertFromPerformer.h
@@ -48,7 +48,7 @@ class ConvertFromPerformer {
 
         int getNumVerts(pfGeoSet *gset);
         osg::Drawable* visitGeoSet(osg::Geode* osgParent,pfGeoSet* geoset);
-        osg::StateSet* visitGeoState(osg::Drawable* osgGeoSet,pfGeoState* geostate);
+        osg::StateSet* visitGeoState(osg::Drawable* osgDrawble,pfGeoState* geostate);
         osg::Material* visitMaterial(osg::StateSet* osgStateSet,pfMaterial* front_mat,pfMaterial* back_mat);
         osg::Texture* visitTexture(osg::StateSet* osgStateSet,pfTexture* tex);