Borland portability tweaks.

Math/MAT3mat.c

@@ -11,7 +11,9 @@
 #endif
 
 #ifdef WIN32
-#  include <memory.h>      /* required for memset() and memcpy() */
+#  ifndef HAVE_STL_SGI_PORT
+#    include <memory.h>      /* required for memset() and memcpy() */
+#  endif
 #endif
 
 #include <string.h>

Math/point3d.hxx

@@ -33,8 +33,11 @@
 
 #include <iostream>
 #include <assert.h>
-#include <math.h>
-
+#if defined( __BORLANDC__ )
+#  define exception c_exception
+#elif defined( __FreeBSD__ )
+#  include <math.h>
+#endif
 
 const double fgPoint3_Epsilon = 0.0000001;
 
@@ -295,6 +298,9 @@ Point3D::distance3D(const Point3D& a ) const
 
 
 // $Log$
+// Revision 1.6  1998/11/23 21:46:37  curt
+// Borland portability tweaks.
+//
 // Revision 1.5  1998/11/20 01:00:38  curt
 // Patch in fgGeoc2Geod() to avoid a floating explosion.
 // point3d.hxx include math.h for FreeBSD

XGL/xglUtils.c

@@ -5,16 +5,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
-#  include <malloc.h>
+#  if !defined( HAVE_STL_SGI_PORT )    // Avoid malloc with STLport
+#    include <malloc.h>
+#  endif
 #endif
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 
-#include <string.h>
 
 #include "xgl.h"