diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:27:37 +0200 |
| commit | 85fc1a18ca7b875cf138d3a862779f8334fb2a57 (patch) | |
| tree | 94c708fb32da8f3dd9402e162124cefcbd1483a0 | |
| parent | fa5410f61a75393d8019200ea8ef6a293ab050a1 (diff) | |
| parent | 3a7050ffed5ce061b114a11e4de4b77aba8efa0b (diff) | |
| download | ffmpeg-85fc1a18ca7b875cf138d3a862779f8334fb2a57.tar.gz | |
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
build: Add _Pragma macro to disable deprecated declaration warnings
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavutil/internal.h | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -1497,6 +1497,7 @@ HAVE_LIST=" pod2man poll_h posix_memalign + pragma_deprecated pthread_cancel rdtsc rsync_contimeout @@ -3777,6 +3778,11 @@ void foo(char * $restrict_keyword p); EOF done +check_cc <<EOF && enable pragma_deprecated +_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +_Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"") +EOF + check_cc <<EOF && enable attribute_packed struct { int x; } __attribute__((packed)) x; EOF 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 |