summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-02-22 16:44:10 -0500
committerGeenz <geenz@geenzo.com>2013-02-22 16:44:10 -0500
commite14c438ab1eb4af2644d53ede2cfb489cb38f852 (patch)
tree8b4342b2af1381e59d65cb8f8c0a5538ba4c4006 /indra/llcommon/llsys.cpp
parent4a935b68151f9d6951a1d1312a3437a8e8150f41 (diff)
parent98e02a5d76ccc044e72949965e84f0803ad0026c (diff)
Merged with latest cocoa-project-viewer.
Diffstat (limited to 'indra/llcommon/llsys.cpp')
-rw-r--r--indra/llcommon/llsys.cpp13
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