RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2013-08-03 09:27:37 +02:00
parent fa5410f61a 3a7050ffed
commit 85fc1a18ca
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -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

8
libavutil/internal.h
View File

@ -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