MacOS X fixes

This commit is contained in:
ehofman 2003-11-23 10:04:45 +00:00
parent 4c1d22b8a6
commit 1ea99cdd4d
2 changed files with 3 additions and 2 deletions

View File

@ -1107,7 +1107,7 @@ char *rptstrip(char *);
char *rptfmt(char *); char *rptfmt(char *);
char *rptfmti(char *, unsigned short int); 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); char *strnstr(char *, char *, size_t);
#endif #endif

View File

@ -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() { static int gen_vasi_light_map() {
const int env_tex_res = 256; const int env_tex_res = 256;
int half_res = env_tex_res / 2; 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; GLuint tex_name;
for ( int i = 0; i < env_tex_res; ++i ) { for ( int i = 0; i < env_tex_res; ++i ) {