Borland portability fixes contributed by Charlie Hotchkiss.

diff --git a/Lib/Bucket/newbucket.hxx b/Lib/Bucket/newbucket.hxx
index 6871b3ee67cd8fd4a230ec8420f2882f76afa674..743c81d61720201dc9c0a8040ce41a4f07ba36c0 100644 (file)
--- a/Lib/Bucket/newbucket.hxx
+++ b/Lib/Bucket/newbucket.hxx
@@ -28,27 +28,24 @@
 
 #include <Include/compiler.h>
 
-#include STL_STRING
-
 #ifdef FG_HAVE_STD_INCLUDES
+#  include <cmath>
 #  include <cstdio> // sprintf()
 #  include <iostream>
 #else
+#  include <math.h>
 #  include <stdio.h> // sprintf()
 #  include <iostream.h>
 #endif
 
+#include STL_STRING
+
 FG_USING_STD(string);
 
 #if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
 FG_USING_STD(ostream);
 #endif
 
-#ifdef __MWERKS__
-#include <math.h>
-#include <stdio.h>
-#endif
-
 #include <Include/fg_constants.h>