MacOS X fixes

[simgear.git] / simgear / metar / Local.h

diff --git a/simgear/metar/Local.h b/simgear/metar/Local.h
index d0e26faeb3a3dbdca20716d373885b00ac0bf450..b65ec718f97b48873365340202a6e9b86d1de88d 100644 (file)
--- a/simgear/metar/Local.h
+++ b/simgear/metar/Local.h
@@ -1096,8 +1096,8 @@ bool ccap2std(char *, Devaddr *, Diskaddr *);
  
 bool std2ccap(Devaddr *, Diskaddr *, char *);
  
-char *strupr(char *);
-char *strlwr(char *);
+//char *strupr(char *);
+//char *strlwr(char *);
 //char *strdup(char *);
 //int strcmpi(char *, char *);
  
@@ -1106,8 +1106,10 @@ char *strlwr(char *);
 char *rptstrip(char *);
 char *rptfmt(char *);
 char *rptfmti(char *, unsigned short int);
- 
+
+#if !defined(__FreeBSD__) && !defined(__APPLE__)  // strnstr is already defined on FreeBSD / Darwin
 char *strnstr(char *, char *, size_t);
+#endif
  
 int stregion(int);
 int ccregion(char *);