diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
| commit | 98e02a5d76ccc044e72949965e84f0803ad0026c (patch) | |
| tree | 49df15d88f940e9901c618eacc9e2286cccb6952 /indra/llcommon/llsys.cpp | |
| parent | e17d69d1d16c607aa304936ebf2ab151684f9c76 (diff) | |
| parent | 27b01e94dd7e98415fa8ec645c37f9291f60df0b (diff) | |
Merge new boost and add OS X 10.8 mods
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 2a8eea88b6..0a68fe2e3b 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -73,6 +73,12 @@ using namespace llsd; # include <mach/mach_host.h> # include <mach/task.h> # include <mach/task_info.h> + +// disable warnings about Gestalt calls being deprecated +// until Apple get's on the ball and provides an alternative +// +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif LL_LINUX # include <errno.h> # include <sys/utsname.h> @@ -1394,3 +1400,10 @@ BOOL gzip_file(const std::string& srcfile, const std::string& dstfile) if (dst != NULL) gzclose(dst); return retval; } + +#if LL_DARWIN +// disable warnings about Gestalt calls being deprecated +// until Apple get's on the ball and provides an alternative +// +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif |