diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-12-24 03:53:15 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-12-24 03:53:15 +0000 |
| commit | f8aa696f9fde35ea7d5a42ef3fb65a5771fe02cc (patch) | |
| tree | 727a2e15c0d079c67a602d1b685e65134c62fca5 /libavformat/grab_bktr.c | |
| parent | 6cf161d21ec309b50830e3b5c864f1ecacc31b80 (diff) | |
Properly check for all required bktr headers.
inspired by a patch from Tatu Kilappa, trilkk iki fi
Originally committed as revision 7374 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/grab_bktr.c')
| -rw-r--r-- | libavformat/grab_bktr.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libavformat/grab_bktr.c b/libavformat/grab_bktr.c index 2145994905..eea221cdd6 100644 --- a/libavformat/grab_bktr.c +++ b/libavformat/grab_bktr.c @@ -24,21 +24,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -#if defined(__FreeBSD__) -# if __FreeBSD__ >= 502100 -# include <dev/bktr/ioctl_meteor.h> -# include <dev/bktr/ioctl_bt848.h> -# else -# include <machine/ioctl_meteor.h> -# include <machine/ioctl_bt848.h> -# endif -#elif defined(__FreeBSD_kernel__) +#if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H) # include <dev/bktr/ioctl_meteor.h> # include <dev/bktr/ioctl_bt848.h> -#elif defined(__DragonFly__) +#elif defined (HAVE_MACHINE_IOCTL_METEOR_H) && defined (HAVE_MACHINE_IOCTL_BT848_H) +# include <machine/ioctl_meteor.h> +# include <machine/ioctl_bt848.h> +#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H) # include <dev/video/meteor/ioctl_meteor.h> # include <dev/video/bktr/ioctl_bt848.h> -#else +#elif HAVE_DEV_IC_BT8XX_H # include <dev/ic/bt8xx.h> #endif #include <unistd.h> |