From ada36c34620f1db8787d1b4a5d974907c78f8156 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 16 Oct 2001 16:48:19 +0000
Subject: [PATCH] Fixes for Win32 compilation.

---
 VisualStudio/osgPlugins/png/png.dsp |  4 ++--
 include/osg/FrameStamp              |  2 +-
 include/osg/Vec2                    |  2 --
 include/osg/Vec3                    |  2 --
 include/osg/Vec4                    | 10 ++++------
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/VisualStudio/osgPlugins/png/png.dsp b/VisualStudio/osgPlugins/png/png.dsp
index f003cc403..22c51975c 100755
--- a/VisualStudio/osgPlugins/png/png.dsp
+++ b/VisualStudio/osgPlugins/png/png.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libpng.lib zlib.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_png.dll" /libpath:"../../../lib"
+# ADD LINK32 libpng.lib zlibstat.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_png.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "png - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libpng.lib zlib.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_pngd.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 libpng.lib zlibstat.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_pngd.dll" /pdbtype:sept /libpath:"../../../lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp
index 73c45e79a..889d358d8 100644
--- a/include/osg/FrameStamp
+++ b/include/osg/FrameStamp
@@ -7,7 +7,7 @@
 
 #include <osg/Referenced>
 
-#ifdef __sgi
+#if defined(__sgi) || defined(WIN32)
 #include <time.h>
 #else
 #include <ctime>
diff --git a/include/osg/Vec2 b/include/osg/Vec2
index 894dabede..adf1c9638 100644
--- a/include/osg/Vec2
+++ b/include/osg/Vec2
@@ -148,8 +148,6 @@ class Vec2
 	    return( norm );
 	}
 
-        inline operator float * (void) { return _v; }
-
 	friend inline ostream& operator << (ostream& output, const Vec2& vec)
         {
 	    output << vec._v[0] << " "
diff --git a/include/osg/Vec3 b/include/osg/Vec3
index 5c6edaea3..c08f053ce 100644
--- a/include/osg/Vec3
+++ b/include/osg/Vec3
@@ -167,8 +167,6 @@ class Vec3
             return( norm );
         }
 
-        inline operator float * (void) { return _v; }
-
 	friend inline ostream& operator << (ostream& output, const Vec3& vec);
 
 };	// end of class Vec3
diff --git a/include/osg/Vec4 b/include/osg/Vec4
index a26bfe8fc..3c2445442 100644
--- a/include/osg/Vec4
+++ b/include/osg/Vec4
@@ -36,11 +36,11 @@ class Vec4
 
         float _v[4];
 
-	inline const bool operator == (const Vec4& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
+        inline const bool operator == (const Vec4& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
 
-	inline const bool operator != (const Vec4& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
+        inline const bool operator != (const Vec4& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
 
-	inline const bool operator <  (const Vec4& v) const
+        inline const bool operator <  (const Vec4& v) const
         {
             if (_v[0]<v._v[0]) return true;
             else if (_v[0]>v._v[0]) return false;
@@ -178,9 +178,7 @@ class Vec4
             return( norm );
         }
 
-        inline operator float * (void) { return _v; }
-
-	friend inline ostream& operator << (ostream& output, const Vec4& vec)
+        friend inline ostream& operator << (ostream& output, const Vec4& vec)
         {
 	    output << vec._v[0] << " "
                    << vec._v[1] << " "