wok-6.x annotate zvbi/stuff/fix-includes.patch @ rev 8666

Updated qt4 with upstream fixes.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Feb 16 06:48:23 2011 +0000 (2011-02-16)
parents
children
rev   line source
slaxemulator@7455 1 Add proper #includes so that we do not get undef errors to S_ISCHR
slaxemulator@7455 2 during linking.
slaxemulator@7455 3
slaxemulator@7455 4 Signed-off-by: Alex Chiang <achiang@canonical.com>
slaxemulator@7455 5 ---
slaxemulator@7455 6 --- zvbi-0.2.33.orig/src/io-dvb.c
slaxemulator@7455 7 +++ zvbi-0.2.33/src/io-dvb.c
slaxemulator@7455 8 @@ -29,6 +29,8 @@
slaxemulator@7455 9 #include <errno.h>
slaxemulator@7455 10 #include <sys/select.h>
slaxemulator@7455 11 #include <sys/ioctl.h>
slaxemulator@7455 12 +#include <sys/types.h>
slaxemulator@7455 13 +#include <sys/stat.h>
slaxemulator@7455 14
slaxemulator@7455 15 #ifndef HAVE_S64_U64
slaxemulator@7455 16 /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
slaxemulator@7455 17 --- zvbi-0.2.33.orig/src/io-v4l.c
slaxemulator@7455 18 +++ zvbi-0.2.33/src/io-v4l.c
slaxemulator@7455 19 @@ -42,6 +42,7 @@ static const char rcsid [] =
slaxemulator@7455 20 #include <assert.h>
slaxemulator@7455 21 #include <sys/time.h> /* timeval */
slaxemulator@7455 22 #include <sys/types.h> /* fd_set, uid_t */
slaxemulator@7455 23 +#include <sys/stat.h> /* S_ISCHR */
slaxemulator@7455 24 #include <sys/ioctl.h> /* for (_)videodev.h */
slaxemulator@7455 25 #include <pthread.h>
slaxemulator@7455 26
slaxemulator@7455 27 --- zvbi-0.2.33.orig/contrib/ntsc-cc.c
slaxemulator@7455 28 +++ zvbi-0.2.33/contrib/ntsc-cc.c
slaxemulator@7455 29 @@ -34,6 +34,7 @@
slaxemulator@7455 30 #include <locale.h>
slaxemulator@7455 31 #include <sys/ioctl.h>
slaxemulator@7455 32 #include <sys/types.h>
slaxemulator@7455 33 +#include <sys/stat.h>
slaxemulator@7455 34 #include <sys/time.h>
slaxemulator@7455 35 #ifdef HAVE_GETOPT_LONG
slaxemulator@7455 36 # include <getopt.h>