mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-28 05:50:43 +00:00
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b': build: Add _Pragma macro to disable deprecated declaration warnings Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
85fc1a18ca
6
configure
vendored
6
configure
vendored
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user