Ready for 0.3.8 release.

[simgear.git] / simgear / xgl / xglUtils.c

diff --git a/simgear/xgl/xglUtils.c b/simgear/xgl/xglUtils.c
index 073a286d999fc34e547a3a2a4c38f69881ea4c96..9fb05be16dfc376886d4c988a98e23ad961325c0 100644 (file)
--- a/simgear/xgl/xglUtils.c
+++ b/simgear/xgl/xglUtils.c
@@ -4,9 +4,12 @@
 #include <string.h>
 
 #if !defined( WIN32 )
-#  if !defined( HAVE_STL_SGI_PORT ) && !defined( __MWERKS__ )
+#  if !defined( HAVE_STL_SGI_PORT ) && !defined( __MWERKS__ ) && !defined( __APPLE__ )
 //   Avoid malloc with STLport and MSL
-#    include <malloc.h>
+#    ifdef HAVE_MALLOC_H
+//     Avoid malloc if system doesn't have it. :-)
+#      include <malloc.h>
+#    endif
 #  endif
 #endif