Re: [PATCH] remove duplicate #includes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
> --- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
> +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
> @@ -51,11 +51,9 @@
>  #if defined(__FreeBSD__) && defined(IN_MODULE)
>  /* Prevent name collision when including sys/ioccom.h */
>  #undef ioctl
> -#include <sys/ioccom.h>
>  #define ioctl(a,b,c)		xf86ioctl(a,b,c)
> -#else
> -#include <sys/ioccom.h>
>  #endif				/* __FreeBSD__ && xf86ioctl */
> +#include <sys/ioccom.h>
>  #define DRM_IOCTL_NR(n)		((n) & 0xff)
>  #define DRM_IOC_VOID		IOC_VOID
>  #define DRM_IOC_READ		IOC_OUT

This one changes the behaviour. But do we want to have this non-linux
hacks in the tree?

Bastian

-- 
It would be illogical to assume that all conditions remain stable.
		-- Spock, "The Enterprise Incident", stardate 5027.3

Attachment: signature.asc
Description: Digital signature


[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux