From: Gregor Jasny Date: Mon, 18 Jun 2012 20:46:31 +0000 (+0200) Subject: kFreeBSD: Add stdint.h header file where (u)intXX_t types were used X-Git-Tag: v4l-utils-0.9.1~146 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f5f37a65901be7575143ffc3d5bfd8eaa99b2c5;p=platform%2Fupstream%2Fv4l-utils.git kFreeBSD: Add stdint.h header file where (u)intXX_t types were used Signed-off-by: Gregor Jasny --- diff --git a/contrib/freebsd/include/linux/dvb/dmx.h b/contrib/freebsd/include/linux/dvb/dmx.h index 2dc48b0..1c48e6b 100644 --- a/contrib/freebsd/include/linux/dvb/dmx.h +++ b/contrib/freebsd/include/linux/dvb/dmx.h @@ -24,6 +24,7 @@ #ifndef _DVBDMX_H_ #define _DVBDMX_H_ +#include #include #include diff --git a/contrib/freebsd/include/linux/dvb/frontend.h b/contrib/freebsd/include/linux/dvb/frontend.h index 8160fe8..fb1ee31 100644 --- a/contrib/freebsd/include/linux/dvb/frontend.h +++ b/contrib/freebsd/include/linux/dvb/frontend.h @@ -26,6 +26,7 @@ #ifndef _DVBFRONTEND_H_ #define _DVBFRONTEND_H_ +#include #include typedef enum fe_type { diff --git a/contrib/freebsd/include/linux/dvb/net.h b/contrib/freebsd/include/linux/dvb/net.h index 28e1f23..e338de0 100644 --- a/contrib/freebsd/include/linux/dvb/net.h +++ b/contrib/freebsd/include/linux/dvb/net.h @@ -24,6 +24,7 @@ #ifndef _DVBNET_H_ #define _DVBNET_H_ +#include #include struct dvb_net_if { diff --git a/contrib/freebsd/include/linux/input.h b/contrib/freebsd/include/linux/input.h index 157568e..c546f6c 100644 --- a/contrib/freebsd/include/linux/input.h +++ b/contrib/freebsd/include/linux/input.h @@ -13,6 +13,7 @@ #include #include #else +#include #include #include #include @@ -46,7 +47,7 @@ typedef int8_t __s8; #endif #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define __user #define _IOC_READ IOC_OUT #define _IOC_WRITE IOC_IN diff --git a/contrib/freebsd/include/linux/ivtv.h b/contrib/freebsd/include/linux/ivtv.h index 511f69e..c6da75a 100644 --- a/contrib/freebsd/include/linux/ivtv.h +++ b/contrib/freebsd/include/linux/ivtv.h @@ -21,6 +21,7 @@ #ifndef __LINUX_IVTV_H__ #define __LINUX_IVTV_H__ +#include #include #include diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 4ca8a88..ad921e1 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -56,6 +56,7 @@ #ifndef __LINUX_VIDEODEV2_H #define __LINUX_VIDEODEV2_H +#include #include #include #include diff --git a/contrib/freebsd/patches/dvb-audio-header.diff b/contrib/freebsd/patches/dvb-audio-header.diff index e8fac54..70437a4 100644 --- a/contrib/freebsd/patches/dvb-audio-header.diff +++ b/contrib/freebsd/patches/dvb-audio-header.diff @@ -1,7 +1,5 @@ -Index: freebsd/include/linux/dvb/audio.h -=================================================================== ---- freebsd.orig/include/linux/dvb/audio.h -+++ freebsd/include/linux/dvb/audio.h +--- a/include/linux/dvb/audio.h ++++ b/include/linux/dvb/audio.h @@ -24,7 +24,7 @@ #ifndef _DVBAUDIO_H_ #define _DVBAUDIO_H_ diff --git a/contrib/freebsd/patches/dvb-dmx-header.diff b/contrib/freebsd/patches/dvb-dmx-header.diff index 8b0af15..6e871da 100644 --- a/contrib/freebsd/patches/dvb-dmx-header.diff +++ b/contrib/freebsd/patches/dvb-dmx-header.diff @@ -1,8 +1,6 @@ -Index: freebsd/include/linux/dvb/dmx.h -=================================================================== ---- freebsd.orig/include/linux/dvb/dmx.h -+++ freebsd/include/linux/dvb/dmx.h -@@ -24,13 +24,8 @@ +--- a/include/linux/dvb/dmx.h ++++ b/include/linux/dvb/dmx.h +@@ -24,13 +24,9 @@ #ifndef _DVBDMX_H_ #define _DVBDMX_H_ @@ -10,6 +8,7 @@ Index: freebsd/include/linux/dvb/dmx.h -#ifdef __KERNEL__ -#include -#else ++#include +#include #include -#endif diff --git a/contrib/freebsd/patches/dvb-frontend-header.diff b/contrib/freebsd/patches/dvb-frontend-header.diff index 1ade398..8376668 100644 --- a/contrib/freebsd/patches/dvb-frontend-header.diff +++ b/contrib/freebsd/patches/dvb-frontend-header.diff @@ -1,12 +1,11 @@ -Index: freebsd/include/linux/dvb/frontend.h -=================================================================== ---- freebsd.orig/include/linux/dvb/frontend.h -+++ freebsd/include/linux/dvb/frontend.h -@@ -26,7 +26,7 @@ +--- a/include/linux/dvb/frontend.h ++++ b/include/linux/dvb/frontend.h +@@ -26,7 +26,8 @@ #ifndef _DVBFRONTEND_H_ #define _DVBFRONTEND_H_ -#include ++#include +#include typedef enum fe_type { diff --git a/contrib/freebsd/patches/dvb-net-header.diff b/contrib/freebsd/patches/dvb-net-header.diff index d0ff332..24838c3 100644 --- a/contrib/freebsd/patches/dvb-net-header.diff +++ b/contrib/freebsd/patches/dvb-net-header.diff @@ -1,12 +1,11 @@ -Index: freebsd/include/linux/dvb/net.h -=================================================================== ---- freebsd.orig/include/linux/dvb/net.h -+++ freebsd/include/linux/dvb/net.h -@@ -24,7 +24,7 @@ +--- a/include/linux/dvb/net.h ++++ b/include/linux/dvb/net.h +@@ -24,7 +24,8 @@ #ifndef _DVBNET_H_ #define _DVBNET_H_ -#include ++#include +#include struct dvb_net_if { diff --git a/contrib/freebsd/patches/dvb-osd-header.diff b/contrib/freebsd/patches/dvb-osd-header.diff index 2bf6c93..a293874 100644 --- a/contrib/freebsd/patches/dvb-osd-header.diff +++ b/contrib/freebsd/patches/dvb-osd-header.diff @@ -1,7 +1,5 @@ -Index: freebsd/include/linux/dvb/osd.h -=================================================================== ---- freebsd.orig/include/linux/dvb/osd.h -+++ freebsd/include/linux/dvb/osd.h +--- a/include/linux/dvb/osd.h ++++ b/include/linux/dvb/osd.h @@ -24,7 +24,7 @@ #ifndef _DVBOSD_H_ #define _DVBOSD_H_ diff --git a/contrib/freebsd/patches/dvb-video-header.diff b/contrib/freebsd/patches/dvb-video-header.diff index 216a6d3..6d7b225 100644 --- a/contrib/freebsd/patches/dvb-video-header.diff +++ b/contrib/freebsd/patches/dvb-video-header.diff @@ -1,7 +1,5 @@ -Index: freebsd/include/linux/dvb/video.h -=================================================================== ---- freebsd.orig/include/linux/dvb/video.h -+++ freebsd/include/linux/dvb/video.h +--- a/include/linux/dvb/video.h ++++ b/include/linux/dvb/video.h @@ -24,13 +24,9 @@ #ifndef _DVBVIDEO_H_ #define _DVBVIDEO_H_ diff --git a/contrib/freebsd/patches/dvb-video-timestamp.diff b/contrib/freebsd/patches/dvb-video-timestamp.diff index adf8b2d..f73f8ea 100644 --- a/contrib/freebsd/patches/dvb-video-timestamp.diff +++ b/contrib/freebsd/patches/dvb-video-timestamp.diff @@ -1,8 +1,6 @@ -Index: freebsd/include/linux/dvb/video.h -=================================================================== ---- freebsd.orig/include/linux/dvb/video.h -+++ freebsd/include/linux/dvb/video.h -@@ -133,7 +133,7 @@ struct video_event { +--- a/include/linux/dvb/video.h ++++ b/include/linux/dvb/video.h +@@ -133,7 +133,7 @@ #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 #define VIDEO_EVENT_DECODER_STOPPED 3 #define VIDEO_EVENT_VSYNC 4 diff --git a/contrib/freebsd/patches/input-header.diff b/contrib/freebsd/patches/input-header.diff index 30e3875..dcf10f5 100644 --- a/contrib/freebsd/patches/input-header.diff +++ b/contrib/freebsd/patches/input-header.diff @@ -1,8 +1,10 @@ -Index: freebsd/include/linux/input.h -=================================================================== ---- freebsd.orig/include/linux/input.h -+++ freebsd/include/linux/input.h -@@ -16,8 +16,44 @@ +--- a/include/linux/input.h ++++ b/include/linux/input.h +@@ -13,11 +13,48 @@ + #include + #include + #else ++#include #include #include #include @@ -36,7 +38,7 @@ Index: freebsd/include/linux/input.h +#endif +#endif + -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#define __user +#define _IOC_READ IOC_OUT +#define _IOC_WRITE IOC_IN diff --git a/contrib/freebsd/patches/ivtv-header.diff b/contrib/freebsd/patches/ivtv-header.diff index 4d9b02c..549ce40 100644 --- a/contrib/freebsd/patches/ivtv-header.diff +++ b/contrib/freebsd/patches/ivtv-header.diff @@ -1,13 +1,12 @@ -Index: freebsd/include/linux/ivtv.h -=================================================================== ---- freebsd.orig/include/linux/ivtv.h -+++ freebsd/include/linux/ivtv.h -@@ -21,8 +21,7 @@ +--- a/include/linux/ivtv.h ++++ b/include/linux/ivtv.h +@@ -21,8 +21,8 @@ #ifndef __LINUX_IVTV_H__ #define __LINUX_IVTV_H__ -#include -#include ++#include +#include #include diff --git a/contrib/freebsd/patches/videodev2-header.diff b/contrib/freebsd/patches/videodev2-header.diff index d82d032..8be0e20 100644 --- a/contrib/freebsd/patches/videodev2-header.diff +++ b/contrib/freebsd/patches/videodev2-header.diff @@ -1,14 +1,13 @@ -Index: freebsd/include/linux/videodev2.h -=================================================================== ---- freebsd.orig/include/linux/videodev2.h -+++ freebsd/include/linux/videodev2.h -@@ -56,14 +56,38 @@ +--- a/include/linux/videodev2.h ++++ b/include/linux/videodev2.h +@@ -56,14 +56,39 @@ #ifndef __LINUX_VIDEODEV2_H #define __LINUX_VIDEODEV2_H -#ifdef __KERNEL__ -#include /* need struct timeval */ -#else ++#include #include +#include +#include