MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>

diff --git a/Bucket/bucketutils.hxx b/Bucket/bucketutils.hxx
index 3145871efb4ee59226204ee3d13af753323f0350..852b8af7aa6e64ed110f5c8800f5ec07f4066881 100644 (file)
--- a/Bucket/bucketutils.hxx
+++ b/Bucket/bucketutils.hxx
@@ -29,6 +29,8 @@
 
 #include <string>
 
+FG_USING_NAMESPACE(std);
+
 #include "bucketutils.h"
 
 #include <Include/compiler.h>
@@ -69,6 +71,9 @@ operator<< ( ostream& out, const fgBUCKET& b )
 
 
 // $Log$
+// Revision 1.2  1999/01/19 20:56:53  curt
+// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
+//
 // Revision 1.1  1998/11/09 23:42:12  curt
 // Initial revision.
 //

diff --git a/Math/point3d.hxx b/Math/point3d.hxx
index 299f71e87d890e5c6611ca0cd9153ef82cc3ce35..a6fe84a3fd481628d671d92dc5711689f7a7e946 100644 (file)
--- a/Math/point3d.hxx
+++ b/Math/point3d.hxx
@@ -39,6 +39,11 @@
 #  include <math.h>
 #endif
 
+// -rp- assert.h is buggy under MWCWP3, as multiple #include undef assert !
+#ifdef __MWERKS__
+#  define assert(x)
+#endif
+
 const double fgPoint3_Epsilon = 0.0000001;
 
 enum {PX, PY, PZ};                 // axes
@@ -298,6 +303,9 @@ Point3D::distance3D(const Point3D& a ) const
 
 
 // $Log$
+// Revision 1.7  1999/01/19 20:56:58  curt
+// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
+//
 // Revision 1.6  1998/11/23 21:46:37  curt
 // Borland portability tweaks.
 //

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index 971c353b4d9ec0edbb9d2308c0f2bd718043480e..56da165227b43fa15f7e76a05597b61f01b2820d 100644 (file)
--- a/XGL/xglUtils.c
+++ b/XGL/xglUtils.c
@@ -8,7 +8,8 @@
 #include <string.h>
 
 #if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
-#  if !defined( HAVE_STL_SGI_PORT )    // Avoid malloc with STLport
+#  if !defined( HAVE_STL_SGI_PORT ) && !defined( __MWERKS__ )
+//   Avoid malloc with STLport and MSL
 #    include <malloc.h>
 #  endif
 #endif