Modified files reflect small changes to work with Sun OS port....

Removed redundant README file in osgviews... was a copy of sgv/README.

src/Demos/osgcluster/broadcaster.cpp

@@ -19,8 +19,10 @@
 #  include <sys/sockio.h>
 #elif defined(__sgi)
 #  include <net/soioctl.h>
-#elif defined(__CYGWIN__)
+#elif defined(__CYGWIN__) 
 // nothing needed
+#elif defined(__sun) 
+#  include <sys/sockio.h>
 #else
 #  error Teach me how to build on this system
 #endif
@@ -64,8 +66,10 @@ bool Broadcaster::init( void )
     {
     struct ifreq ifr;
     setsockopt( _so, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on));
-#ifdef __linux
+#if defined (__linux)
     strcpy( ifr.ifr_name, "eth0" );
+#elif defined(__sun)
+    strcpy( ifr.ifr_name, "hme0" );
 #else
     strcpy( ifr.ifr_name, "ef0" );
 #endif

src/Demos/osgviews/README

@@ -1,26 +0,0 @@
-Note: Using sgv with Peformer (for IRIX and Linux users only)
-=============================================================
-
-If you find problems with loading .pfb files its likely that its due to undefined
-symbols.  This isn't a problem with the OSG implementation, but alas the only
-current solution is to directly link you app with the Performer libraries. The 
-Makefile contains two library list.  In Makefile you'll see something like :
-
-    #note, use this library list when using the Performer osgPlugin.
-    #LIBS = ${PFLIBS} -losgGLUT -losgDB -losg -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-    #note, standard library list. 
-    LIBS = -losgGLUT -losgDB -losg -lGLU -lGL  -lm -lXmu  -lX11 -lXi
-
-Simple comment in the LIBS line with PFLIBS and comment out the standard LIBS,
-then :
-
-    make clean
-    make
-
-Hopefully the Performer distribution will eventually work as a dynamic plugin 
-but until that day we're stuck with this 'hack'...
-
-
-Robert Osfield,
-March 20001.

src/osgPlugins/dx/AreaGeoSetTriangulator.cpp

@@ -537,7 +537,7 @@ void for_each_triangle2(const osg::GeoSet& gset,T& op)
         break;        
     }
 
-};
+}
 
 
 //---------------------------------------------------------------------------

src/osgPlugins/dx/DXWriter.cpp

@@ -601,6 +601,7 @@ inline int IsNaNorInf( float f )
   return _isnan(f) || !_finite(f);
 #else
 #  error Teach me how to find non-numbers on this platform.
+return 0;
 #endif
 }
 

src/osgPlugins/quicktime/ReaderWriterQT.cpp

@@ -64,7 +64,7 @@ class ReaderWriterQT : public osgDB::ReaderWriter
 			// origDepth in BYTES, buffDepth in BITS 
 			
 			if (pixels == 0) {
-					cerr << "LoadBufferFromDarwinPath failed " << fileName.c_str() << QTfailureMessage() << endl;
+					std::cerr << "LoadBufferFromDarwinPath failed " << fileName.c_str() << QTfailureMessage() << std::endl;
 					return 0;
 			}			          
             
@@ -84,7 +84,7 @@ class ReaderWriterQT : public osgDB::ReaderWriter
 					pixelFormat = GL_RGBA;
 					break;
 				default :
-					cerr << "Unknown file type in " << fileName.c_str() << " with " << origDepth << endl;
+					std::cerr << "Unknown file type in " << fileName.c_str() << " with " << origDepth << std::endl;
 					pixelFormat = (GLenum)-1;
 					return 0;
 					break;
@@ -145,7 +145,7 @@ class ReaderWriterQT : public osgDB::ReaderWriter
 							}
 							break;
 						default :
-							// cerr << "ERROR IN RETURNED PIXEL DEPTH, CANNOT COPE" << endl;
+							// std::cerr << "ERROR IN RETURNED PIXEL DEPTH, CANNOT COPE" << std::endl;
 							return 0;
 							break;
 					}
@@ -162,7 +162,7 @@ class ReaderWriterQT : public osgDB::ReaderWriter
                 GL_UNSIGNED_BYTE,
                 pixels );
 
-            notify(INFO) << "image read ok "<<buffWidth<<"  "<<buffHeight<<endl;
+            notify(INFO) << "image read ok "<<buffWidth<<"  "<<buffHeight<<std::endl;
             return image;
         }
 

src/osgPlugins/tga/ReaderWriterTGA.cpp

@@ -428,7 +428,7 @@ int headerlen)
 {
     char * ptr;
     if (headerlen < 18) return 0;
-    ptr = strrchr(filename, '.');
+    ptr = (char *)strrchr(filename, '.');
     if (!ptr) return 0;          /* TGA files must end with .tga|.TGA */
 
     if (strcmp(ptr, ".tga") && strcmp(ptr, ".TGA")) return 0;