This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
fileio includes kernel headers gratuitously.
- From: David Woodhouse <dwmw2 at infradead dot org>
- To: ecos-patches at sources dot redhat dot com
- Date: Thu, 27 Nov 2003 14:45:33 +0000
- Subject: fileio includes kernel headers gratuitously.
... which breaks inclusion of fileio into RedBoot, which is needed to
make RedBoot support JFFS2.
--
dwmw2
Index: io/fileio/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/ChangeLog,v
retrieving revision 1.35
diff -u -p -r1.35 ChangeLog
--- io/fileio/current/ChangeLog 23 Oct 2003 17:15:19 -0000 1.35
+++ io/fileio/current/ChangeLog 27 Nov 2003 14:33:46 -0000
@@ -1,3 +1,8 @@
+2003-11-28 David Woodhouse <dwmw2@redhat.com>
+
+ * include/fileio.h, include/sockio.h, src/dir.cxx, src/fd.cxx,
+ src/io.cxx: Don't include kernel headers if no kernel support.
+
2003-10-23 Savin Zlobec <savin@elatec.si>
* src/io.cxx: Added cyg_fs_fsetinfo and cyg_fs_fgetinfo functions.
Index: io/fileio/current/include/fileio.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/include/fileio.h,v
retrieving revision 1.9
diff -u -p -r1.9 fileio.h
--- io/fileio/current/include/fileio.h 23 Oct 2003 17:15:19 -0000 1.9
+++ io/fileio/current/include/fileio.h 27 Nov 2003 14:33:46 -0000
@@ -59,7 +59,6 @@
//=============================================================================
#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
#include <pkgconf/io_fileio.h>
#include <cyg/infra/cyg_type.h>
Index: io/fileio/current/include/sockio.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/include/sockio.h,v
retrieving revision 1.4
diff -u -p -r1.4 sockio.h
--- io/fileio/current/include/sockio.h 23 May 2002 23:06:07 -0000 1.4
+++ io/fileio/current/include/sockio.h 27 Nov 2003 14:33:46 -0000
@@ -59,7 +59,6 @@
//=============================================================================
#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
#include <pkgconf/io_fileio.h>
#include <cyg/infra/cyg_type.h>
Index: io/fileio/current/src/dir.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/src/dir.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 dir.cxx
--- io/fileio/current/src/dir.cxx 11 Apr 2003 02:06:11 -0000 1.5
+++ io/fileio/current/src/dir.cxx 27 Nov 2003 14:33:46 -0000
@@ -54,10 +54,8 @@
//==========================================================================
#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
#include <pkgconf/io_fileio.h>
-#include <cyg/kernel/ktypes.h> // base kernel types
#include <cyg/infra/cyg_trac.h> // tracing macros
#include <cyg/infra/cyg_ass.h> // assertion macros
Index: io/fileio/current/src/fd.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/src/fd.cxx,v
retrieving revision 1.4
diff -u -p -r1.4 fd.cxx
--- io/fileio/current/src/fd.cxx 23 May 2002 23:06:08 -0000 1.4
+++ io/fileio/current/src/fd.cxx 27 Nov 2003 14:33:46 -0000
@@ -54,10 +54,12 @@
//==========================================================================
#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
#include <pkgconf/io_fileio.h>
+#ifdef CYGPKG_KERNEL
+#include <pkgconf/kernel.h>
#include <cyg/kernel/ktypes.h> // base kernel types
+#endif
#include <cyg/infra/cyg_trac.h> // tracing macros
#include <cyg/infra/cyg_ass.h> // assertion macros
Index: io/fileio/current/src/io.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/src/io.cxx,v
retrieving revision 1.8
diff -u -p -r1.8 io.cxx
--- io/fileio/current/src/io.cxx 23 Oct 2003 17:15:20 -0000 1.8
+++ io/fileio/current/src/io.cxx 27 Nov 2003 14:33:46 -0000
@@ -55,10 +55,8 @@
//==========================================================================
#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
#include <pkgconf/io_fileio.h>
-#include <cyg/kernel/ktypes.h> // base kernel types
#include <cyg/infra/cyg_trac.h> // tracing macros
#include <cyg/infra/cyg_ass.h> // assertion macros
@@ -66,7 +64,6 @@
#include "fio.h" // Private header
-#include <cyg/kernel/mutex.hxx> // mutex definitions
//==========================================================================
// File object locking