[FFmpeg-cvslog] r22486 - in trunk: configure libavdevice/bktr.c

[Michael Kostylev]

On Fri Mar 12 18:28:02 2010
diego wrote:

> Log:
> Add _XOPEN_SOURCE=600 to CPPFLAGS on NetBSD.
> 
> This make NetBSD compile out of the box at the cost of a hack, but a
> locally contained one that is preferable to the one used in the wild.
> Currently the NetBSD FATE box adds -D_NETBSD_SOURCE to CPPFLAGS to work
> around broken system headers. Since it is unlikely for NetBSD to fix their
> headers, it is better to use a standard flag instead of a system-specific one.
> 
> As a sideeffect, this allows getting rid of a local _NETBSD_SOURCE definition.

Nope. We need either just _NETBSD_SOURCE in configure or
_XOPEN_SOURCE in configure AND _NETBSD_SOURCE in libavdevice/bktr.c.

> Modified:
>    trunk/configure
>    trunk/libavdevice/bktr.c
> 
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	Fri Mar 12 17:59:21 2010	(r22485)
> +++ trunk/configure	Fri Mar 12 18:28:02 2010	(r22486)
> @@ -2151,6 +2151,7 @@ case $target_os in
>      netbsd)
>          oss_indev_extralibs="-lossaudio"
>          oss_outdev_extralibs="-lossaudio"
> +        add_cppflags -D_XOPEN_SOURCE=600
>          ;;
>      openbsd)
>          enable malloc_aligned
> 
> Modified: trunk/libavdevice/bktr.c
> ==============================================================================
> --- trunk/libavdevice/bktr.c	Fri Mar 12 17:59:21 2010	(r22485)
> +++ trunk/libavdevice/bktr.c	Fri Mar 12 18:28:02 2010	(r22486)
> @@ -25,7 +25,6 @@
>   */
>  
>  #define _BSD_SOURCE 1
> -#define _NETBSD_SOURCE
>  
>  #include "libavformat/avformat.h"
>  #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H

Michael