diff --git a/Include/compiler.h b/Include/compiler.h index 3d1971c8d..c00f4e0af 100644 --- a/Include/compiler.h +++ b/Include/compiler.h @@ -168,18 +168,18 @@ # define STL_ALGORITHM <algorithm> # define STL_FUNCTIONAL <functional> # define STL_IOMANIP <iomanip> -# define STL_IOSTREAM <iostream> # define STL_STDEXCEPT <stdexcept> -# define STL_STRING <string> # define STL_STRSTREAM <strstream> # define FG_INCOMPLETE_FUNCTIONAL # endif // HAVE_SGI_STL_PORT +# define STL_IOSTREAM <iostream> +# define STL_STRING <string> # define FG_NO_DEFAULT_TEMPLATE_ARGS # define FG_NAMESPACES -# define FG_HAVE_STD +// # define FG_HAVE_STD #endif // __BORLANDC__ diff --git a/Include/fg_constants.h b/Include/fg_constants.h index ed88b50fa..cf24ec67a 100644 --- a/Include/fg_constants.h +++ b/Include/fg_constants.h @@ -38,13 +38,12 @@ #include "Include/compiler.h" -#ifdef FG_MATCH_EXCEPTION_CLASH -# define exception C_exception -#endif - #ifdef FG_HAVE_STD_INCLUDES # include <cmath> #else +# ifdef FG_MATH_EXCEPTION_CLASH +# define exception C_exception +# endif # include <math.h> #endif diff --git a/Include/fg_typedefs.h b/Include/fg_typedefs.h index 52e9368cc..048842d6e 100644 --- a/Include/fg_typedefs.h +++ b/Include/fg_typedefs.h @@ -2,8 +2,11 @@ // Alterations: Copyright C. Hotchkiss 1996 // // $Log$ -// Revision 1.1 1999/04/05 21:32:40 curt -// Initial revision +// Revision 1.2 1999/04/22 18:45:42 curt +// Borland tweaks. +// +// Revision 1.1.1.1 1999/04/05 21:32:40 curt +// Start of 0.6.x branch. // // Revision 1.2 1998/05/13 18:23:46 curt // fg_typedefs.h: updated version by Charlie Hotchkiss @@ -107,6 +110,7 @@ typedef int (*FNPTR) ( void ); typedef int (*FNINTPTR) ( int ); typedef int (*FNUIPTR) ( UINT ); typedef double( *DBLFNPTR)( void ); +typedef float( *FLTFNPTR)( void ); #endif