MacOS-X fixes.

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 1dd6034f6f02e8f98435a0c8e22a53dc8969fcbc..640347665434f5c1e6a97a82af76d62f7dbb8a8b 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -59,7 +59,7 @@ inline int (isnan)(double r) { return isnan(r); }
 static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static bool state_initialized = false;
 static bool bump_mapping = false;
-static int nb_texture_unit = 0;
+static GLint nb_texture_unit = 0;
 static ssgTexture *normal_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
 static ssgTexture *color_map[SGCloudLayer::SG_MAX_CLOUD_COVERAGES][2] = { 0 };
 static GLuint normalization_cube_map;

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 9b88e3d001ad6997bc329b94bbcbfd760a241613..7d97d95cc8e7a9ac2a07912e99b45542439fcf32 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -37,8 +37,7 @@
 #  ifdef __GNUC__
 #    if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
 //  #        include <math.h>
-extern "C" int isnan (double);
-extern "C" int isinf (double);
+inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 #    else
     // any C++ header file undefines isinf and isnan
     // so this should be included before <iostream>