[PATCH] Compile fix on Linux 2.6.28 / x86

[Pavel Troller]

Hi!
  Due to changes in Linux kernel include file structure, the following patch
is necessary to compile wine with the 2.6.28 kernel:

--- wine/dlls/ntdll/serial.c.old	2009-01-03 19:31:17.000000000 +0100
+++ wine/dlls/ntdll/serial.c	2009-01-03 20:31:11.000000000 +0100
@@ -74,6 +74,10 @@
 #include "wine/debug.h"
 
 #ifdef HAVE_LINUX_SERIAL_H
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+#include <asm/types.h>
+#endif
 #include <linux/serial.h>
 #endif

  With regards, Pavel Troller

[Austin English]

On Sat, Jan 3, 2009 at 1:36 PM, Pavel Troller <patrol(a)sinus.cz> wrote:
> Hi!
>  Due to changes in Linux kernel include file structure, the following patch
> is necessary to compile wine with the 2.6.28 kernel:
>
> --- wine/dlls/ntdll/serial.c.old        2009-01-03 19:31:17.000000000 +0100
> +++ wine/dlls/ntdll/serial.c    2009-01-03 20:31:11.000000000 +0100
> @@ -74,6 +74,10 @@
>  #include "wine/debug.h"
>
> #ifdef HAVE_LINUX_SERIAL_H
> +#include <linux/version.h>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
> +#include <asm/types.h>
> +#endif
>  #include <linux/serial.h>
>  #endif
>
> With regards, Pavel Troller

Patches should be sent to wine-patches(a)winehq.org.

-- 
-Austin

[Marcus Meissner]

On Sat, Jan 03, 2009 at 08:36:07PM +0100, Pavel Troller wrote:
> Hi!
>   Due to changes in Linux kernel include file structure, the following patch
> is necessary to compile wine with the 2.6.28 kernel:
>
> --- wine/dlls/ntdll/serial.c.old	2009-01-03 19:31:17.000000000 +0100
> +++ wine/dlls/ntdll/serial.c	2009-01-03 20:31:11.000000000 +0100
> @@ -74,6 +74,10 @@
>  #include "wine/debug.h"
>
> #ifdef HAVE_LINUX_SERIAL_H
> +#include <linux/version.h>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
> +#include <asm/types.h>
> +#endif
>  #include <linux/serial.h>
>  #endif

Better use #ifdef HAVE_ASM_TYPES_H here, its already been tested for.

Ciao, Marcus

[Pavel Troller]

> On Sat, Jan 03, 2009 at 08:36:07PM +0100, Pavel Troller wrote:
> > Hi!
> >   Due to changes in Linux kernel include file structure, the following patch
> > is necessary to compile wine with the 2.6.28 kernel:
> >
> > --- wine/dlls/ntdll/serial.c.old	2009-01-03 19:31:17.000000000 +0100
> > +++ wine/dlls/ntdll/serial.c	2009-01-03 20:31:11.000000000 +0100
> > @@ -74,6 +74,10 @@
> >  #include "wine/debug.h"
> >
> > #ifdef HAVE_LINUX_SERIAL_H
> > +#include <linux/version.h>
> > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
> > +#include <asm/types.h>
> > +#endif
> >  #include <linux/serial.h>
> >  #endif
>
> Better use #ifdef HAVE_ASM_TYPES_H here, its already been tested for.
>
> Ciao, Marcus

OK, redone and resent to wine-patches.
  With regards, Pavel Troller