summaryrefslogtreecommitdiff
path: root/libavutil/internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-03 09:27:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-03 09:27:37 +0200
commit85fc1a18ca7b875cf138d3a862779f8334fb2a57 (patch)
tree94c708fb32da8f3dd9402e162124cefcbd1483a0 /libavutil/internal.h
parentfa5410f61a75393d8019200ea8ef6a293ab050a1 (diff)
parent3a7050ffed5ce061b114a11e4de4b77aba8efa0b (diff)
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b': build: Add _Pragma macro to disable deprecated declaration warnings Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
-rw-r--r--libavutil/internal.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index c5835fb4f8..4b85efd867 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -62,6 +62,14 @@
# define av_export
#endif
+#if HAVE_PRAGMA_DEPRECATED
+# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"")
+#else
+# define FF_DISABLE_DEPRECATION_WARNINGS
+# define FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
#ifndef INT_BIT
# define INT_BIT (CHAR_BIT * sizeof(int))
#endif