kioslave/media compile error

[Dave Feustel]

On Saturday 18 December 2004 04:41 pm, Adriaan de Groot wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On Saturday 18 December 2004 22:33, Dave Feustel wrote:
> > On Saturday 18 December 2004 04:26 pm, Ismail Donmez wrote:
> > > On Saturday 18 December 2004 23:23, Kévin Ottens wrote:
> > > > Le Samedi 18 Décembre 2004 19:28, Thiago Macieira a écrit :
> > > > > Let me repeat once again: userspace programs, like KDE, should NOT
> > > > > include kernel header files. Copy the necessary structures to a
> > > > > private header.
> > > >
> > > > Do you mean that I should recopy the necessary parts (one struct and
> > > > several #define) of linux/cdrom.h into the cpp file? What happened if
> > > > some of the #define'd values changes?
> > >
> > > Try,
> > >
> > > #undef __STRICT_ANSI__
> > > #include <linux/cdrom.h>
> > > #define __STRICT_ANSI_
> >
> > I'm trying to port k3b to openbsd. k3b also requires linux/cdrom.
> > That file (nor the files included within it) is(are) not available in
> > OpenBSD, so I am unable to complete the port at the moment.
> 
> We did the port to FreeBSD, so linux/cdrom isn't actually required. However, 
> OpenBSD is probably not included in the forest of #ifdefs that is involved in 
> the port, so it's still getting the default (Linux) code.
> 
I applied the FreeBSD  patches to *17. One patch was rejected. 
The .rej file follows:
=================
./src/device/k3bscsicommand.h.rej
/home/daf/K3b/k3b-0.11.17}cat `find . -name '*.rej'`
***************
*** 17,25 ****
  #define _K3B_SCSI_COMMAND_H_

  #include <sys/types.h>
  #undef __STRICT_ANSI__
  #include <linux/cdrom.h>
  #define __STRICT_ANSI__


  #include <qstring.h>
--- 17,43 ----
  #define _K3B_SCSI_COMMAND_H_

  #include <sys/types.h>
+ #ifndef __FreeBSD__
  #undef __STRICT_ANSI__
  #include <linux/cdrom.h>
  #define __STRICT_ANSI__
+ #else
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <camlib.h>
+ #undef INQUIRY
+ #undef READ_10
+ #undef READ_12
+ #undef READ_BUFFER
+ #undef READ_CAPACITY
+ #undef REQUEST_SENSE
+ #undef START_STOP_UNIT
+ #undef SYNCHRONIZE_CACHE
+ #undef TEST_UNIT_READY
+ #undef WRITE_10
+ #undef WRITE_12
+ #undef WRITE_BUFFER
+ #endif


  #include <qstring.h>