Fixes for SOlaris build

Make/makedefs

@@ -156,8 +156,6 @@ ifeq ($(OS),SunOS)
   ifeq ($(COMPILER),gnu)
     C++               = g++
     DEPARG            = -M
-    INC               += 
-    DEF               += -W -Wall -fPIC -fpermissive
     OPTF              = -O2
     DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
     SHARED            = -shared -fPIC 
@@ -195,6 +193,7 @@ ifeq ($(OS),SunOS)
     LINKARGS          =  
     GIF_LIBS          = /usr/local/lib/libgif.a
     TIFF_LIB	      = /usr/local/lib/libtiff.a
+    JPEG_INCLUDE      = -I/usr/local/include
     JPEG_LIBS         = /usr/local/lib/libjpeg.a
     PNG_LIBS          = /usr/local/lib/libpng.a /usr/local/lib/libz.a
   endif 
@@ -218,6 +217,7 @@ ifeq ($(OS),SunOS)
   GDAL_LIBS         = `gdal-config --libs`
 
 
+
 endif
 
 #### IRIX Specific definitions
@@ -228,6 +228,7 @@ ifeq ($(OS),IRIX)
 	  C++               = CC
 	  DEPARG            = -M
 	  INC               += -I${TOPDIR}/include -I/usr/freeware/include
+	  LDFLAGS	    += -L/usr/local/lib
 	  DEF               += -LANG:std -OPT:Olimit=0 \
 		             -DEBUG:woff=1681 -DEBUG:woff=1682 -DEBUG:woff=3303\
 		             -MDupdate $(MAKEDEPEND)

include/osgDB/DatabasePager

@@ -212,19 +212,17 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
           * Note, must only be called from a valid graphics context. */
         virtual void compileGLObjects(osg::State& state,double& availableTime);
 
+        typedef std::list< osg::ref_ptr<osg::PagedLOD> >   PagedLODList;
+        typedef std::set< osg::ref_ptr<osg::StateSet> >    StateSetList;
+        typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
+        typedef std::pair<StateSetList,DrawableList>       DataToCompile;
+        typedef std::map< unsigned int, DataToCompile >    DataToCompileMap; 
+        typedef std::set<unsigned int>                     ActiveGraphicsContexts;
 
     protected:
 
         virtual ~DatabasePager();
 
-        typedef std::list< osg::ref_ptr<osg::PagedLOD> >   PagedLODList;
-
-        typedef std::set< osg::ref_ptr<osg::StateSet> >    StateSetList;
-        typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
-        typedef std::pair<StateSetList,DrawableList>       DataToCompile;
-        typedef std::map< unsigned int, DataToCompile >    DataToCompileMap; 
-
-        typedef std::set<unsigned int>                     ActiveGraphicsContexts;
 
         friend struct DatabaseRequest;
         

include/osgDB/Registry

@@ -397,6 +397,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
 
         void eraseWrapper(DotOsgWrapperMap& wrappermap,DotOsgWrapper* wrapper);
 
+    public:
         /** Functor used in internal implementations.*/
         struct ReadFunctor
         {
@@ -413,6 +414,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
             const ReaderWriter::Options* _options;
         };
 
+   protected:
         // forward declare helper classes
         struct ReadObjectFunctor;
         struct ReadImageFunctor;

src/osgPlugins/jpeg/GNUmakefile

@@ -4,9 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
         ReaderWriterJPEG.cpp\
 
-ifeq ($(OS),HP-UX)
 INC += $(JPEG_INCLUDE)
-endif
 
 LIBS  += $(OSG_LIBS) $(JPEG_LIBS) $(OTHER_LIBS)
 

src/osgPlugins/osga/OSGA_Archive.h

@@ -80,11 +80,6 @@ class OSGA_Archive : public osgDB::Archive
         /** Write an osg::Node with specified file name to the Archive.*/
         virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options=NULL) const;
         
-        
-    protected:
-  
-        mutable osgDB::ReentrantMutex _serializerMutex;
-
         #if defined(_MSC_VER)
         typedef __int64 pos_type;
         typedef __int64 size_type;
@@ -95,6 +90,11 @@ class OSGA_Archive : public osgDB::Archive
         
         typedef std::pair<pos_type, size_type> PositionSizePair;
         typedef std::map<std::string, PositionSizePair> FileNamePositionMap;
+        
+    protected:
+  
+        mutable osgDB::ReentrantMutex _serializerMutex;
+
 
         friend class IndexBlock;
 
@@ -148,6 +148,7 @@ class OSGA_Archive : public osgDB::Archive
             char*           _data;
         };
     
+	public: 
         /** Functor used in internal implementations.*/
         struct ReadFunctor
         {
@@ -161,11 +162,6 @@ class OSGA_Archive : public osgDB::Archive
             std::string _filename;
             const osgDB::ReaderWriter::Options* _options;
         };
-        
-        struct ReadObjectFunctor;
-        struct ReadImageFunctor;
-        struct ReadHeightFieldFunctor;
-        struct ReadNodeFunctor;
 
         /** Functor used in internal implementations.*/
         struct WriteFunctor
@@ -180,6 +176,13 @@ class OSGA_Archive : public osgDB::Archive
             std::string _filename;
             const osgDB::ReaderWriter::Options* _options;
         };
+        
+	protected:
+        struct ReadObjectFunctor;
+        struct ReadImageFunctor;
+        struct ReadHeightFieldFunctor;
+        struct ReadNodeFunctor;
+
 
         struct WriteObjectFunctor;
         struct WriteImageFunctor;