summaryrefslogtreecommitdiff
path: root/indra/mac_updater/mac_updater.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/mac_updater/mac_updater.cpp
parent4a935b68151f9d6951a1d1312a3437a8e8150f41 (diff)
parent98e02a5d76ccc044e72949965e84f0803ad0026c (diff)
Merged with latest cocoa-project-viewer.
Diffstat (limited to 'indra/mac_updater/mac_updater.cpp')
-rw-r--r--indra/mac_updater/mac_updater.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index aa45c5d23f..f533d47b18 100644
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
@@ -47,6 +47,11 @@
#include "llerrorcontrol.h"
+#if LL_DARWIN
+// FSPathMakeRef, FSObjectCopy, deprecations...
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
enum
{
kEventClassCustom = 'Cust',
@@ -1255,3 +1260,7 @@ void *updatethreadproc(void*)
return(NULL);
}
+
+#if LL_DARWIN
+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif