# HG changeset patch
# User gthomas
# Date 1070289032 0
# Node ID 41bc3b72d3eb4499c9c5d7d14044a36602f1d3f0
# Parent  6799a1e89127bab48d73f557a799c1095c3bf5d7
Remove gratuitous inclusion of kernel header files - from David Woodhouse

diff --git a/packages/io/fileio/current/ChangeLog b/packages/io/fileio/current/ChangeLog
--- 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.
diff --git a/packages/io/fileio/current/include/fileio.h b/packages/io/fileio/current/include/fileio.h
--- 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>
diff --git a/packages/io/fileio/current/include/sockio.h b/packages/io/fileio/current/include/sockio.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>
diff --git a/packages/io/fileio/current/src/dir.cxx b/packages/io/fileio/current/src/dir.cxx
--- 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
 
diff --git a/packages/io/fileio/current/src/fd.cxx b/packages/io/fileio/current/src/fd.cxx
--- 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
 
diff --git a/packages/io/fileio/current/src/io.cxx b/packages/io/fileio/current/src/io.cxx
--- 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