Borland C++ tweaks.

MacOS/Metrowerks tweaks.
Fix for fgText default constructor.

diff --git a/Lib/Bucket/newbucket.cxx b/Lib/Bucket/newbucket.cxx
index bb6f8bb9a2645013be3580c23df884abf479db59..20d980b927b2e8cdf49c85cc78b2d051e9d8b847 100644 (file)
--- a/Lib/Bucket/newbucket.cxx
+++ b/Lib/Bucket/newbucket.cxx
@@ -28,6 +28,8 @@
 #endif
 
 
+#include <math.h>
+
 #include <Misc/fgpath.hxx>
 
 #include "newbucket.hxx"

diff --git a/Lib/Misc/fgstream.cxx b/Lib/Misc/fgstream.cxx
index 3d5a09339e84108bc52e84c0455808205429262c..a7203de2cbbe626ae1f70e6694c6a483db93d8bc 100644 (file)
--- a/Lib/Misc/fgstream.cxx
+++ b/Lib/Misc/fgstream.cxx
@@ -118,18 +118,29 @@ skipws( istream& in ) {
     while ( in.get(c) ) {
 
 #ifdef __MWERKS__
+
        // -dw- for unix file compatibility
        // -clo- this causes problems for unix
        if ( (c == '\n') || (c == '\r') || (c == '\0') ) {
            break;
-       }       
-#endif
+       }
+
+       if ( ! isspace( c ) && c != '\n' ) {
+           // put pack the non-space character
+           in.putback(c);
+           break;
+       }
+
+#else
 
        if ( ! isspace( c ) ) {
            // put pack the non-space character
            in.putback(c);
            break;
        }
+
+#endif
+
     }
     return in;
 }

diff --git a/Lib/XGL/xglUtils.c b/Lib/XGL/xglUtils.c
index 56da165227b43fa15f7e76a05597b61f01b2820d..d781fa23fdcf2985428ea852acdad3e9edb1a23e 100644 (file)
--- a/Lib/XGL/xglUtils.c
+++ b/Lib/XGL/xglUtils.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
+#if !defined( WIN32 )
 #  if !defined( HAVE_STL_SGI_PORT ) && !defined( __MWERKS__ )
 //   Avoid malloc with STLport and MSL
 #    include <malloc.h>
@@ -28,12 +28,7 @@
 
 int   xglTraceOn = TRUE ;
 
-#ifndef WIN32
-    FILE *xglTraceFd = stdout ;
-#else /* WIN32 */
-    /* Bail for now, we just want it to compile I guess */
-    FILE *xglTraceFd = NULL;
-#endif /* WIN32 */
+FILE *xglTraceFd = NULL;
 
 struct GLenumLookup
 {