2002-02-05 14:59:46

by Adrian Bunk

Subject: [patch] fix 2.4.18-pre8 compile error in cosa.c

Hi Marcelo,

the patch below fixes the following compile error in 2.4.18-pre8:

<-- snip -->

gcc -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=k6 -DKBUILD_BASENAME=cosa -c -o cosa.o cosa.c
cosa.c:109: parse error

<-- snip -->

Line 109 is
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)

I was first thinking about including linux/version.h to fix it but since
in another place where there's in the cosa.c in kernel 2.2.20 a check for
2.2 kernels the code for the older kernels was already removed in the
cosa.c in kernel 2.4.18-pre8 I assume that it's no longer intended to use
this version of the file in 2.2 kernels.

--- drivers/net/wan/cosa.c.old Tue Feb 5 15:37:20 2002
+++ drivers/net/wan/cosa.c Tue Feb 5 15:47:37 2002
@@ -105,13 +105,6 @@
#include <net/syncppp.h>
#include "cosa.h"

-/* Linux version stuff */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)
-typedef struct wait_queue *wait_queue_head_t;
-#define DECLARE_WAITQUEUE(wait, current) \
- struct wait_queue wait = { current, NULL }
-#endif
-
/* Maximum length of the identification string. */
#define COSA_MAX_ID_STRING 128


cu
Adrian

2002-02-05 15:01:26

by Jan Kasprzak

Subject: Re: [patch] fix 2.4.18-pre8 compile error in cosa.c

Adrian Bunk wrote:
: the patch below fixes the following compile error in 2.4.18-pre8:

Looks OK, please apply.

: --- drivers/net/wan/cosa.c.old Tue Feb 5 15:37:20 2002
: +++ drivers/net/wan/cosa.c Tue Feb 5 15:47:37 2002
: @@ -105,13 +105,6 @@
: #include <net/syncppp.h>
: #include "cosa.h"
:
: -/* Linux version stuff */
: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)
: -typedef struct wait_queue *wait_queue_head_t;
: -#define DECLARE_WAITQUEUE(wait, current) \
: - struct wait_queue wait = { current, NULL }
: -#endif
: -
: /* Maximum length of the identification string. */
: #define COSA_MAX_ID_STRING 128

-Yenya

--
| Jan "Yenya" Kasprzak <kas at {fi.muni.cz - work | yenya.net - private}> |
| GPG: ID 1024/D3498839 Fingerprint 0D99A7FB206605D7 8B35FCDE05B18A5E |
| http://www.fi.muni.cz/~kas/ Czech Linux Homepage: http://www.linux.cz/ |
|\ As anyone can tell you trying to force things on Linux developers /|
|\\ generally works out pretty badly. (Alan Cox in lkml) //|

2002-02-05 19:23:13

by Marcelo Tosatti

Subject: Re: [patch] fix 2.4.18-pre8 compile error in cosa.c

On Tue, 5 Feb 2002, Adrian Bunk wrote:

> Hi Marcelo,
>
> the patch below fixes the following compile error in 2.4.18-pre8:

Hi Adrian,

Patch applied.

Thanks