From b57a4ec32361842d89bf06789af19da07d84afe6 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 5 Aug 2004 13:41:52 +0000
Subject: [PATCH] From Marco Jez, VS.NET warning fixes.

---
 src/osgPlugins/lib3ds/tracks.cpp | 6 +++---
 src/osgPlugins/txp/trpage_sys.h  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/lib3ds/tracks.cpp b/src/osgPlugins/lib3ds/tracks.cpp
index ed7ee896f..43b167d15 100644
--- a/src/osgPlugins/lib3ds/tracks.cpp
+++ b/src/osgPlugins/lib3ds/tracks.cpp
@@ -467,7 +467,7 @@ lib3ds_lin1_track_eval(Lib3dsLin1Track *track, Lib3dsFloat *p, Lib3dsFloat t)
   }
   if (!k->next) {
     if (track->flags&LIB3DS_REPEAT) {
-      nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
+      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
       for (k=track->keyL; k->next!=0; k=k->next) {
         if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) {
           break;
@@ -775,7 +775,7 @@ lib3ds_lin3_track_eval(Lib3dsLin3Track *track, Lib3dsVector p, Lib3dsFloat t)
   }
   if (!k->next) {
     if (track->flags&LIB3DS_REPEAT) {
-      nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
+      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
       for (k=track->keyL; k->next!=0; k=k->next) {
         if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) {
           break;
@@ -1122,7 +1122,7 @@ lib3ds_quat_track_eval(Lib3dsQuatTrack *track, Lib3dsQuat q, Lib3dsFloat t)
   }
   if (!k->next) {
     if (track->flags&LIB3DS_REPEAT) {
-      nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
+      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
       for (k=track->keyL; k->next!=0; k=k->next) {
         if ((nt>=k->tcb.frame) && (nt<k->next->tcb.frame)) {
           break;
diff --git a/src/osgPlugins/txp/trpage_sys.h b/src/osgPlugins/txp/trpage_sys.h
index 1879c7340..baa4e4ff4 100644
--- a/src/osgPlugins/txp/trpage_sys.h
+++ b/src/osgPlugins/txp/trpage_sys.h
@@ -37,11 +37,12 @@
 
 #include <windows.h>
 
-#ifdef __MSC_VER
+#ifdef _MSC_VER
 // Microsoft Developer warnings that annoy me
 #pragma warning ( disable : 4251)
 #pragma warning ( disable : 4275)
 #pragma warning ( disable : 4786)
+#pragma warning ( disable : 4251)
 #endif
 
 // Somewhat system independent file deletion macro