Borland C++ tweaks.

MacOS/Metrowerks tweaks.
Fix for fgText default constructor.
This commit is contained in:
curt 1999-06-20 01:52:31 +00:00
parent 6b2bf2fa8e
commit bb882a1239
3 changed files with 17 additions and 9 deletions

View File

@ -28,6 +28,8 @@
#endif
#include <math.h>
#include <Misc/fgpath.hxx>
#include "newbucket.hxx"

View File

@ -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;
}

View File

@ -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
{