[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.58.0901210129350.13170@shell2.speakeasy.net>
Date: Wed, 21 Jan 2009 01:51:10 -0800 (PST)
From: Trent Piepho <xyzzy@...akeasy.org>
To: Arnd Bergmann <arnd@...db.de>
cc: Jaswinder Singh Rajput <jaswinderlinux@...il.com>,
Mauro Carvalho Chehab <mchehab@...radead.org>,
Jaswinder Singh Rajput <jaswinder@...nel.org>,
linux-media@...r.kernel.org, video4linux-list@...hat.com,
Sam Ravnborg <sam@...nborg.org>, Ingo Molnar <mingo@...e.hu>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: Confusion in usr/include/linux/videodev.h
On Wed, 21 Jan 2009, Arnd Bergmann wrote:
> On Wednesday 21 January 2009, Jaswinder Singh Rajput wrote:
> > > diff -r 29c5787efcda linux/include/linux/videodev.h
> > > --- a/linux/include/linux/videodev.h Thu Jan 15 09:07:03 2009 -0800
> > > +++ b/linux/include/linux/videodev.h Wed Jan 21 00:51:45 2009 -0800
> > > @@ -15,7 +15,8 @@
> > > #include <linux/ioctl.h>
> > > #include <linux/videodev2.h>
> > >
> > > -#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
> > > +#if (defined(__KERNEL__) && defined(CONFIG_VIDEO_V4L1_COMPAT)) \
> > > + || !defined (__KERNEL__)
> > >
> > > #define VID_TYPE_CAPTURE 1 /* Can capture */
> > > #define VID_TYPE_TUNER 2 /* Can tune */
> > >
> > > Now CONFIG_VIDEO_V4L1_COMPAT will only be used in the kernel.
> > >
> >
> > No, this will still give warnings.
>
> You could #define another conditional, like this:
>
> #ifndef __KERNEL__
> # define __V4L1_COMPAT_API /* Always provide definitions to user space */
> #else /* __KERNEL__ */
> # ifdef CONFIG_VIDEO_V4L1_COMPAT
> # define __V4L1_COMPAT_API
> # endif /* CONFIG_VIDEO_V4L1_COMPAT /*
> #endif /* __KERNEL__ */
I see what the real problem is now, the unifdef program isn't smart enough
to realize that it knows the result of !defined(__KERNEL__) || defined(FOO)
and so it keeps those ifdefs in when it should be able to remove them.
This works too:
#ifndef __KERNEL__
# define __V4L1_COMPAT_API /* Always provide definitions to user space */
#elif defined(CONFIG_VIDEO_V4L1_COMPAT) /* __KERNEL__ */
# define __V4L1_COMPAT_API
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists