From: ehofman <ehofman>
Date: Wed, 27 Jul 2005 08:02:11 +0000 (+0000)
Subject: MacOS-X fixes.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7aa514d9ba3f48b0f13f533ae5b84e8233d0db30;p=simgear.git

MacOS-X fixes.
---

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 1dd6034f..64034766 100644
--- 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 9b88e3d0..7d97d95c 100644
--- 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>