MacOS X fixes

diff --git a/simgear/metar/Local.h b/simgear/metar/Local.h
index 10f9081cfe2fa0331a55ef47429a59a51ddbde8b..b65ec718f97b48873365340202a6e9b86d1de88d 100644 (file)
--- a/simgear/metar/Local.h
+++ b/simgear/metar/Local.h
@@ -1107,7 +1107,7 @@ char *rptstrip(char *);
 char *rptfmt(char *);
 char *rptfmti(char *, unsigned short int);
 
 char *rptfmt(char *);
 char *rptfmti(char *, unsigned short int);
 

-#ifndef __FreeBSD__  // strnstr is already defined on FreeBSD
+#if !defined(__FreeBSD__) && !defined(__APPLE__)  // strnstr is already defined on FreeBSD / Darwin

 char *strnstr(char *, char *, size_t);
 #endif
  
 char *strnstr(char *, char *, size_t);
 #endif
  

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 9d0ee86dbf8ababe49f0683a32ee9cd4c46047b3..79404622273603993f4521103aa1d2c33c274597 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -178,7 +178,8 @@ static int gen_taxiway_dir_light_map( int r, int g, int b, int alpha ) {
 static int gen_vasi_light_map() {
     const int env_tex_res = 256;
     int half_res = env_tex_res / 2;
 static int gen_vasi_light_map() {
     const int env_tex_res = 256;
     int half_res = env_tex_res / 2;

-    unsigned char env_map[env_tex_res][env_tex_res][4];
+
+    static unsigned char env_map[env_tex_res][env_tex_res][4];

     GLuint tex_name;
 
     for ( int i = 0; i < env_tex_res; ++i ) {
     GLuint tex_name;
 
     for ( int i = 0; i < env_tex_res; ++i ) {