diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-05-11 17:52:51 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-12 11:41:59 +0200 |
| commit | 046f081b46c8479820409cf8f530b988221bd15b (patch) | |
| tree | 7926931a77448c75214f2af2498bba23524c8e34 /libavformat | |
| parent | 45faf7fcd335b91e41b0e3ba4e397a9640d8c694 (diff) | |
| download | ffmpeg-046f081b46c8479820409cf8f530b988221bd15b.tar.gz | |
configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.
Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e.
glibc-based ones.
This change makes BSD systems compile out-of-the-box without the need for
adding specific flags manually. It also allows dropping a number of flags
set manually on a file-per-file basis, but were only present to work around
breakage introduced by the presence of _POSIX_C_SOURCE.
Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems. We use XSI extensions
in several places already, so it is preferable to define it globally instead
of littering source files with individual #defines only needed for glibc.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/applehttp.c | 1 | ||||
| -rw-r--r-- | libavformat/applehttpproto.c | 1 | ||||
| -rw-r--r-- | libavformat/avio.c | 3 | ||||
| -rw-r--r-- | libavformat/os_support.c | 1 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 3 | ||||
| -rw-r--r-- | libavformat/udp.c | 2 |
6 files changed, 2 insertions, 9 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 822d80bb00..e3b1500044 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -25,7 +25,6 @@ * http://tools.ietf.org/html/draft-pantos-http-live-streaming */ -#define _XOPEN_SOURCE 600 #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c index 37b289a1e0..85f3cfcef4 100644 --- a/libavformat/applehttpproto.c +++ b/libavformat/applehttpproto.c @@ -25,7 +25,6 @@ * http://tools.ietf.org/html/draft-pantos-http-live-streaming */ -#define _XOPEN_SOURCE 600 #include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/avio.c b/libavformat/avio.c index 0702aff007..8881f269f2 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -19,9 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* needed for usleep() */ -#define _XOPEN_SOURCE 600 #include <unistd.h> + #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "os_support.h" diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 05577b7553..a0fcd6c9ba 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -22,7 +22,6 @@ /* needed by inet_aton() */ #define _SVID_SOURCE -#define _DARWIN_C_SOURCE #include "config.h" #include "avformat.h" diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 43305a30c7..4623088c38 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* needed for gethostname() */ -#define _XOPEN_SOURCE 600 - #include "libavcodec/get_bits.h" #include "avformat.h" #include "mpegts.h" diff --git a/libavformat/udp.c b/libavformat/udp.c index 62c1c7c107..d6522bf0be 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -25,7 +25,7 @@ */ #define _BSD_SOURCE /* Needed for using struct ip_mreq with recent glibc */ -#define _DARWIN_C_SOURCE /* Needed for using IP_MULTICAST_TTL on OS X */ + #include "avformat.h" #include "avio_internal.h" #include "libavutil/parseutils.h" |