From d7748704d77d31e76b3da3a1f95bd7bbab456377 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 23 Nov 1998 21:46:36 +0000
Subject: [PATCH] Borland portability tweaks.

---
 Math/MAT3mat.c   |  4 +++-
 Math/point3d.hxx | 10 ++++++++--
 XGL/xglUtils.c   |  6 ++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Math/MAT3mat.c b/Math/MAT3mat.c
index 6eb74cb1c..9a1e7c991 100644
--- a/Math/MAT3mat.c
+++ b/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>
diff --git a/Math/point3d.hxx b/Math/point3d.hxx
index 30054bd0f..299f71e87 100644
--- a/Math/point3d.hxx
+++ b/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
diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index bc5d7217e..971c353b4 100644
--- a/XGL/xglUtils.c
+++ b/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"