Mercurial > flash_v2

changeset 1410:41bc3b72d3eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove gratuitous inclusion of kernel header files - from David Woodhouse
author gthomas
date Mon, 01 Dec 2003 14:30:32 +0000
parents 6799a1e89127
children 5e52f3febc7d
files packages/io/fileio/current/ChangeLog packages/io/fileio/current/include/fileio.h packages/io/fileio/current/include/sockio.h packages/io/fileio/current/src/dir.cxx packages/io/fileio/current/src/fd.cxx packages/io/fileio/current/src/io.cxx
diffstat 6 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/fileio/current/ChangeLog
+++ b/packages/io/fileio/current/ChangeLog
@@ -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.
--- a/packages/io/fileio/current/include/fileio.h
+++ b/packages/io/fileio/current/include/fileio.h
@@ -59,7 +59,6 @@
 //=============================================================================
 
 #include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
 #include <pkgconf/io_fileio.h>
 
 #include <cyg/infra/cyg_type.h>
--- a/packages/io/fileio/current/include/sockio.h
+++ b/packages/io/fileio/current/include/sockio.h
@@ -59,7 +59,6 @@
 //=============================================================================
 
 #include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
 #include <pkgconf/io_fileio.h>
 
 #include <cyg/infra/cyg_type.h>
--- a/packages/io/fileio/current/src/dir.cxx
+++ b/packages/io/fileio/current/src/dir.cxx
@@ -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
 
--- a/packages/io/fileio/current/src/fd.cxx
+++ b/packages/io/fileio/current/src/fd.cxx
@@ -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
 
--- a/packages/io/fileio/current/src/io.cxx
+++ b/packages/io/fileio/current/src/io.cxx
@@ -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