OK the adding the #include <linux/version.h> fixed the problem in
lnx_io.c.  I then had the same error in lnx_kbd.c. To fix that error in
lnx_kbd.c I had to add both the include statement and if defined
statements from lnx_io.c.  Below are the lines added to lnx_io.c and
lnx_kbd.c and the error and the lines listed in the error from lnx_kbd.c

===== lines added to lnx_io.c and lnx_kbd.c ====================
  #"hack for devel kernels"
sedit '/#define NEED_EVENTS/a\
\#include \<linux\/version.h\>\'
$SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
&&
sedit '/#define NEED_EVENTS/a\
\#include \<linux\/version.h\>\'
$SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
&&
sedit '102a\
\/* Deal with spurious kernel header change */\
\#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)\
\# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)\
\#  define rate period\
\# endif\
\#endif\
\ \'
$SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
&&
======================================================
==== Error now getting ===============================
gcc -m32 -c -march=athlon-mp -mmmx -mfpmath=sse -msse -m3dnow -O3
-march=athlon-mp -mmmx -mfpmath=sse -msse -m3dnow -O3   
-fno-merge-constants
-I../../../../../../programs/Xserver/hw/xfree86/common
-I../../../../../../programs/Xserver/hw/xfree86/os-support -I.
-I../../../../../../programs/Xserver/include           
-I../../../../../../exports/include/X11
-I../../../../../../include/extensions
-I../../../../../../programs/Xserver/hw/xfree86/os-support/shared 
-I../../../../../.. -I../../../../../../exports/include   -Dlinux
-D__i386__ -D_POSIX_C_SOURCE=199309L                            
-D_POSIX_SOURCE -D_XOPEN_SOURCE                          -D_BSD_SOURCE
-D_SVID_SOURCE                            
-D_GNU_SOURCE                           -DSHAPE -DXINPUT -DXKB -DLBX
-DXAPPGROUP        -DXCSECURITY -DTOGCUP   -DXF86BIGFONT
-DDPMSExtension    -DPIXPRIV -DPANORAMIX   -DRENDER -DRANDR -DGCCUSESGAS
-DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH                         
-DXFreeXDGA -DXvExtension                               -DXFree86LOADER 
-DXFree86Server        -DXF86VIDMODE                           
-DXvMCExtension                                                                 
-DSMART_SCHEDULE                -DBUILDDEBUG -DXResExtension                           
  -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG  -DFUNCPROTO=15 -DNARROWPROTO   
-DHAS_MTRR_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC   lnx_kbd.c
lnx_kbd.c: In function `SetKbdRepeat':
lnx_kbd.c:197: error: structure has no member named `period'
lnx_kbd.c:198: error: structure has no member named `period'
===================================================
=== Lines 197 and 198 from lnx_kbd.c ==============
  if (pKbd->rate >= 0)
    rate = pKbd->rate * 10;
===================================================

On Mon, 2003-08-18 at 10:13, Marc Aurele La France wrote:
> On Mon, 18 Aug 2003, Robin Cook wrote:
> 
> > I am getting the below error when I try to compile xfree86 4.3.99.10 on
> > a system with the 2.6.0-test3 kernel using gcc 3.3.1. Any idea how to
> > fix this?
> 
> > gcc -m32 -c -march=athlon-mp -mmmx -mfpmath=sse -msse -m3dnow -O3
> > -march=athlon-mp -mmmx -mfpmath=sse -msse -m3dnow -O3
> > -fno-merge-constants
> > -I../../../../../../programs/Xserver/hw/xfree86/common
> > -I../../../../../../programs/Xserver/hw/xfree86/os-support -I.
> > -I../../../../../../programs/Xserver/include
> > -I../../../../../../exports/include/X11
> > -I../../../../../../include/extensions
> > -I../../../../../../programs/Xserver/hw/xfree86/os-support/shared
> > -I../../../../../.. -I../../../../../../exports/include   -Dlinux
> > -D__i386__ -D_POSIX_C_SOURCE=199309L
> > -D_POSIX_SOURCE -D_XOPEN_SOURCE
> >                 -D_BSD_SOURCE -D_SVID_SOURCE
> > -D_GNU_SOURCE                           -DSHAPE -DXINPUT -DXKB -DLBX
> > -DXAPPGROUP
> > -DXCSECURITY -DTOGCUP   -DXF86BIGFONT -DDPMSExtension    -DPIXPRIV
> > -DPANORAMIX
> >  -DRENDER -DRANDR -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH
> >                         -DXFreeXDGA -DXvExtension
> > -DXFree86LOADER  -DXFree86Server
> > -DXF86VIDMODE
> >                         -DXvMCExtension
> >                         -DSMART_SCHEDULE
> > -DBUILDDEBUG -DXResExtension
> > -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG  -DFUNCPROTO=15 -DNARROWPROTO
> > -DHAS_MTRR_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC   lnx_io.c
> > lnx_io.c: In function `KDKBDREP_ioctl_ok':
> > lnx_io.c:90: error: structure has no member named `rate'
> > lnx_io.c:98: error: structure has no member named `rate'
> > lnx_io.c:100: error: structure has no member named `rate'
> > lnx_io.c:101: error: structure has no member named `rate'
> > lnx_io.c:102: error: structure has no member named `rate'
> > make[7]: *** [lnx_io.o] Error 1
> > make[7]: Leaving directory
> > `/usr/src/xc.bld/programs/Xserver/hw/xfree86/os-support/linux'
> > make[6]: *** [linux] Error 2
> > make[6]: Leaving directory
> > `/usr/src/xc.bld/programs/Xserver/hw/xfree86/os-support'
> 
> Humm.  This looks like an oversight.  Try changing lnx_io.c to #include
> <linux/version.h>.
> 
> Marc.
> 
> +----------------------------------+-----------------------------------+
> |  Marc Aurele La France           |  work:   1-780-492-9310           |
> |  Computing and Network Services  |  fax:    1-780-492-1729           |
> |  352 General Services Building   |  email:  [EMAIL PROTECTED]          |
> |  University of Alberta           +-----------------------------------+
> |  Edmonton, Alberta               |                                   |
> |  T6G 2H1                         |     Standard disclaimers apply    |
> |  CANADA                          |                                   |
> +----------------------------------+-----------------------------------+
> XFree86 Core Team member.  ATI driver and X server internals.
> 
> _______________________________________________
> XFree86 mailing list
> [EMAIL PROTECTED]
> http://XFree86.Org/mailman/listinfo/xfree86
> 

_______________________________________________
XFree86 mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/xfree86

Reply via email to