Tweak for SGI portability.

[simgear.git] / Math / MAT3mat.c

diff --git a/Math/MAT3mat.c b/Math/MAT3mat.c
index 7b1a24c2a31e08d496af218994fb9f0e2644fbe7..9a1e7c9911641fa46baa2cf29e4097a5490e369d 100644 (file)
--- 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>
@@ -28,6 +30,8 @@
 /* --------------------------  Public Routines ---------------------------- */
 
 
+#if !defined( USE_XTRA_MAT3_INLINES )
+
 /*
  * Sets a matrix to identity.
  */
@@ -95,6 +99,7 @@ MAT3mult (double (*result_mat)[4], register double (*mat1)[4], register double (
                       mat1[i][3] * mat2[3][j]);
    MAT3copy (result_mat, tmp_mat);
 }
+#endif // !defined( USE_XTRA_MAT3_INLINES )
 
 /*
  * This returns the transpose of a matrix.  The result matrix may be